[vmkit-commits] [vmkit] r69047 - /vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Apr 14 11:54:55 2009
New Revision: 69047

URL: http://llvm.org/viewvc/llvm-project?rev=69047&view=rev
Log:
UTF8s do not need VTs.


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

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp Tue Apr 14 11:54:55 2009
@@ -358,7 +358,9 @@
   std::vector<Constant*> Elmts;
 
   // virtual table
-  if (cl->isClass()) {
+  if (!cl) {
+    Elmts.push_back(Constant::getNullValue(JnjvmModule::VTType));
+  } else if (cl->isClass()) {
     Elmts.push_back(getVirtualTable(cl->asClass()->virtualVT));
   } else {
     Elmts.push_back(getVirtualTable(cl->asArrayClass()->virtualVT));
@@ -1102,7 +1104,7 @@
   const StructType* STy = StructType::get(Elemts);
   
   std::vector<Constant*> Cts;
-  Cts.push_back(CreateConstantForBaseObject(val->getClass()));
+  Cts.push_back(CreateConstantForBaseObject(0));
   Cts.push_back(ConstantInt::get(JnjvmModule::pointerSizeType, val->size));
   
   std::vector<Constant*> Vals;