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

[Nicolas Geoffray]

Author: geoffray
Date: Wed Jul 15 05:57:10 2009
New Revision: 75771

URL: http://llvm.org/viewvc/llvm-project?rev=75771&view=rev
Log:
Don't set the destructor in case of AOT. The compiler thinks there
is a JavaMethod there.


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=75771&r1=75770&r2=75771&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp Wed Jul 15 05:57:10 2009
@@ -338,8 +338,10 @@
 }
 
 void JavaVirtualTable::setNativeDestructor(uintptr_t ptr, const char* name) {
-  destructor = ptr;
-  operatorDelete = ptr;
+	if (!cl->classLoader->getCompiler()->isStaticCompiling()) {
+	  destructor = ptr;
+  	operatorDelete = ptr;
+	}
 }
 
 JavaMethod* Class::lookupInterfaceMethodDontThrow(const UTF8* name,