* src/vm/jit/oprofile-agent.cpp: Set source formatting to c++.

[cacao.git] / src / vmcore / method.c

diff --git a/src/vmcore/method.c b/src/vmcore/method.c
index 393ad44728396b57ca6a1053e69340eb08874ed8..1882270c1d7e28e1c4c3980aacb1298c41f0f986 100644 (file)
--- a/src/vmcore/method.c
+++ b/src/vmcore/method.c
@@ -39,10 +39,10 @@
 
 #include "vm/array.h"
 #include "vm/builtin.h"
-#include "vm/exceptions.h"
+#include "vm/exceptions.hpp"
 #include "vm/global.h"
 #include "vm/resolve.h"
-#include "vm/vm.h"
+#include "vm/vm.hpp"
 
 #include "vm/jit/code.h"
 #include "vm/jit/methodheader.h"
@@ -50,6 +50,7 @@
 #include "vm/jit_interface.h"
 
 #include "vmcore/class.h"
+#include "vmcore/globals.hpp"
 #include "vmcore/linker.h"
 #include "vmcore/loader.h"
 #include "vmcore/method.h"
@@ -1037,7 +1038,6 @@ void method_add_assumption_monomorphic(methodinfo *m, methodinfo *caller)
        m->assumptions = as;
 }
 
-
 /* method_break_assumption_monomorphic *****************************************
 
    Break the assumption that this method is monomorphic. All callers that
@@ -1064,10 +1064,21 @@ void method_break_assumption_monomorphic(methodinfo *m, method_worklist **wl)
                );
 
                method_add_to_worklist(as->context, wl);
+
+#if defined(ENABLE_TLH) && 0
+               /* XXX hack */
+               method_assumption *as2;
+               as2 = m->assumptions;
+               m->assumptions = NULL;
+               method_break_assumption_monomorphic(as->context, wl);
+               /*
+               assert(m->assumptions == NULL);
+               m->assumptions = as2;*/
+#endif
+
        }
 }
 
-
 /* method_printflags ***********************************************************
 
    Prints the flags of a method to stdout like.