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

[Nicolas Geoffray]

Author: geoffray
Date: Sun Apr 26 16:11:10 2009
New Revision: 70161

URL: http://llvm.org/viewvc/llvm-project?rev=70161&view=rev
Log:
I am _so_ buggy.


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=70161&r1=70160&r2=70161&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp Sun Apr 26 16:11:10 2009
@@ -808,7 +808,8 @@
   
   for (uint32 i = 0; i < nbVirtualMethods; ++i) {
     JavaMethod& meth = virtualMethods[i];
-    if (meth.name->equals(classLoader->bootstrapLoader->finalize)) {
+    if (meth.name->equals(classLoader->bootstrapLoader->finalize) &&
+        meth.type->equals(classLoader->bootstrapLoader->clinitType)) {
       meth.offset = 0;
     } else {
       JavaMethod* parent = super?