[vmkit-commits] [vmkit] r107644 - in /vmkit/trunk/lib/J3: Compiler/JavaJIT.cpp VMCore/JavaClass.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Jul  6 01:35:41 2010
New Revision: 107644

URL: http://llvm.org/viewvc/llvm-project?rev=107644&view=rev
Log:
Makre sure to initialize codeInfo.


Modified:
    vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
    vmkit/trunk/lib/J3/VMCore/JavaClass.cpp

Modified: vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp?rev=107644&r1=107643&r2=107644&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp Tue Jul  6 01:35:41 2010
@@ -530,6 +530,8 @@
       compilingMethod->codeInfo[i].bytecodeIndex = codeInfo[i].bytecodeIndex;
       compilingMethod->codeInfo[i].bytecode = codeInfo[i].bytecode;
     }
+  } else {
+    compilingMethod->codeInfo == NULL;
   }
  
   return llvmFunction;
@@ -1365,6 +1367,8 @@
       compilingMethod->codeInfo[i].bytecodeIndex = codeInfo[i].bytecodeIndex;
       compilingMethod->codeInfo[i].bytecode = codeInfo[i].bytecode;
     }
+  } else {
+    compilingMethod->codeInfo == NULL;
   }
 
   return llvmFunction;

Modified: vmkit/trunk/lib/J3/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaClass.cpp?rev=107644&r1=107643&r2=107644&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaClass.cpp Tue Jul  6 01:35:41 2010
@@ -669,6 +669,7 @@
   access = A;
   canBeInlined = false;
   offset = 0;
+  codeInfo = NULL;
 }
 
 void JavaField::initialise(Class* cl, const UTF8* N, const UTF8* T, uint16 A) {
@@ -865,8 +866,10 @@
   uint16 nbMethods = reader.readU2();
   if (isAbstract(access)) {
     virtualMethods = new JavaMethod[nbMethods];
+    memset(virtualMethods, 0, nbMethods * sizeof(JavaMethod));
   } else {
-    virtualMethods = new(classLoader->allocator, "Methods") JavaMethod[nbMethods];
+    virtualMethods =
+      new(classLoader->allocator, "Methods") JavaMethod[nbMethods];
   }
   staticMethods = virtualMethods + nbMethods;
   for (int i = 0; i < nbMethods; i++) {