Merged branch subtype-trunk into default.

[cacao.git] / src / vm / jit / codegen-common.cpp

diff --git a/src/vm/jit/codegen-common.cpp b/src/vm/jit/codegen-common.cpp
index 47ad041c746bba5c21f8d237ba258fea267d6ee2..218c2537f9b85a4c2cd314b8f1c09f0468ba06ad 100644 (file)
--- a/src/vm/jit/codegen-common.cpp
+++ b/src/vm/jit/codegen-common.cpp
@@ -45,19 +45,17 @@
 #include <assert.h>
 #include <string.h>
 
-#include "vm/jit/jitcache.hpp"
-
 #include "vm/types.h"
 
 #include "codegen.h"
 #include "md.h"
 #include "md-abi.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/avl.h"
 #include "toolbox/list.hpp"
-#include "toolbox/logging.h"
+#include "toolbox/logging.hpp"
 
 #include "native/llni.h"
 #include "native/localref.hpp"
@@ -67,7 +65,7 @@
 
 #include "vm/jit/builtin.hpp"
 #include "vm/exceptions.hpp"
-#include "vm/method.h"
+#include "vm/method.hpp"
 #include "vm/options.h"
 #include "vm/string.hpp"
 
@@ -654,13 +652,9 @@ void codegen_finish(jitdata *jd)
        /* jump table resolving */
 
        for (jr = cd->jumpreferences; jr != NULL; jr = jr->next)
-       {
                *((functionptr *) ((ptrint) epoint + jr->tablepos)) =
                        (functionptr) ((ptrint) epoint + (ptrint) jr->target->mpc);
 
-               JITCACHE_ADD_CACHED_REF(code, CRT_JUMPREFERENCE, jr->target->mpc, jr->tablepos);
-       }
-
        /* patcher resolving */
 
        patcher_resolve(jd);