[vmkit-commits] [vmkit] r61774 - /vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Mon Jan  5 17:23:28 2009
New Revision: 61774

URL: http://llvm.org/viewvc/llvm-project?rev=61774&view=rev
Log:
Set a compiled pointer only if there is none.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp?rev=61774&r1=61773&r2=61774&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp Mon Jan  5 17:23:28 2009
@@ -379,11 +379,12 @@
 
 void JavaMethod::setCompiledPtr(void* ptr, const char* name) {
   classDef->acquire();
-  assert(code == 0 && "Code of Java method already set!");
-  code = ptr;
-  Jnjvm* vm = JavaThread::get()->getJVM();
-  vm->addMethodInFunctionMap(this, code);
-  classDef->classLoader->getModule()->setMethod(this, ptr, name);
+  if (code == 0) {
+    code = ptr;
+    Jnjvm* vm = JavaThread::get()->getJVM();
+    vm->addMethodInFunctionMap(this, code);
+    classDef->classLoader->getModule()->setMethod(this, ptr, name);
+  }
   access |= ACC_NATIVE;
   classDef->release();
 }