Merged trunk and subtype.

[cacao.git] / src / vm / jit / i386 / patcher.c

diff --git a/src/vm/jit/i386/patcher.c b/src/vm/jit/i386/patcher.c
index 61d853bf38f29b339269f59e16c429b4c67ecaad..034ca21ef2239421c87fcad37a950f382a7e9550 100644 (file)
--- a/src/vm/jit/i386/patcher.c
+++ b/src/vm/jit/i386/patcher.c
@@ -36,15 +36,15 @@
 
 #include "native/native.h"
 
-#include "vm/builtin.h"
+#include "vm/jit/builtin.hpp"
 #include "vm/class.h"
-#include "vm/field.h"
+#include "vm/field.hpp"
 #include "vm/initialize.h"
 #include "vm/options.h"
 #include "vm/references.h"
 #include "vm/resolve.h"
 
-#include "vm/jit/patcher-common.h"
+#include "vm/jit/patcher-common.hpp"
 
 
 #define PATCH_BACK_ORIGINAL_MCODE                                                      \
@@ -633,7 +633,6 @@ bool patcher_checkcast_class(patchref_t *pr)
        /* patch super class' vftbl */
 
        *((ptrint *) (ra + 1)) = (ptrint) c->vftbl;
-       *((ptrint *) (ra + 5 + 6 + 6 + 2 + 1)) = (ptrint) c->vftbl;
 
        return true;
 }