[vmkit-commits] [vmkit] r85384 - /vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Wed Oct 28 03:13:55 2009
New Revision: 85384

URL: http://llvm.org/viewvc/llvm-project?rev=85384&view=rev
Log:
Since the JIT can also compile non-Java methods, test if the compiled
method matches the Java method.


Modified:
    vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp

Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp?rev=85384&r1=85383&r2=85384&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJITCompiler.cpp Wed Oct 28 03:13:55 2009
@@ -39,9 +39,8 @@
   virtual void NotifyFunctionEmitted(const Function &F,
                                      void *Code, size_t Size,
                                      const EmittedFunctionDetails &Details) {
-    if (currentCompiledMethod) {
-      assert(JavaLLVMCompiler::getMethod(currentCompiledMethod) == &F &&
-             "Method mismatch");
+    if (currentCompiledMethod &&
+        JavaLLVMCompiler::getMethod(currentCompiledMethod) == &F) {
       Jnjvm* vm = JavaThread::get()->getJVM();
       vm->addMethodInFunctionMap(currentCompiledMethod, Code);
     } else {