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

[Nicolas Geoffray]

Author: geoffray
Date: Wed Apr 15 03:56:57 2009
New Revision: 69159

URL: http://llvm.org/viewvc/llvm-project?rev=69159&view=rev
Log:
Not giving a class tu UTF8 was stupid: utf8s are stored in strings.


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=69159&r1=69158&r2=69159&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp Wed Apr 15 03:56:57 2009
@@ -357,10 +357,7 @@
   
   std::vector<Constant*> Elmts;
 
-  // virtual table
-  if (!cl) {
-    Elmts.push_back(Constant::getNullValue(JnjvmModule::VTType));
-  } else if (cl->isClass()) {
+  if (cl->isClass()) {
     Elmts.push_back(getVirtualTable(cl->asClass()->virtualVT));
   } else {
     Elmts.push_back(getVirtualTable(cl->asArrayClass()->virtualVT));
@@ -1104,7 +1101,8 @@
   const StructType* STy = StructType::get(Elemts);
   
   std::vector<Constant*> Cts;
-  Cts.push_back(CreateConstantForBaseObject(0));
+  CommonClass* cl = JavaThread::get()->getJVM()->upcalls->ArrayOfChar;
+  Cts.push_back(CreateConstantForBaseObject(cl));
   Cts.push_back(ConstantInt::get(JnjvmModule::pointerSizeType, val->size));
   
   std::vector<Constant*> Vals;