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

[Nicolas Geoffray]

Author: geoffray
Date: Mon May 18 04:51:09 2009
New Revision: 71999

URL: http://llvm.org/viewvc/llvm-project?rev=71999&view=rev
Log:
Fix AOT generation of UTF8s.


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=71999&r1=71998&r2=71999&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp Mon May 18 04:51:09 2009
@@ -1087,7 +1087,6 @@
 Constant* JavaAOTCompiler::CreateConstantFromUTF8(const UTF8* val) {
   std::vector<const Type*> Elemts;
   const ArrayType* ATy = ArrayType::get(Type::Int16Ty, val->size);
-  Elemts.push_back(JnjvmModule::JavaObjectType->getContainedType(0));
   Elemts.push_back(JnjvmModule::pointerSizeType);
 
   Elemts.push_back(ATy);
@@ -1095,8 +1094,6 @@
   const StructType* STy = StructType::get(Elemts);
   
   std::vector<Constant*> Cts;
-  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;