[vmkit-commits] [vmkit] r54917 - /vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Mon Aug 18 06:40:51 2008
New Revision: 54917

URL: http://llvm.org/viewvc/llvm-project?rev=54917&view=rev
Log:
Arrays of bootstrap classes are loaded by the bootstrap loader.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp

Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp?rev=54917&r1=54916&r2=54917&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp Mon Aug 18 06:40:51 2008
@@ -130,14 +130,6 @@
 
 Value* LLVMCommonClassInfo::getVar(JavaJIT* jit) {
   if (!varGV) {
-#ifdef MULTIPLE_VM
-    if (jit->compilingClass->classLoader->TheModule == JnjvmClassLoader::bootstrapLoader->TheModule &&
-        classDef->isArray && classDef->classLoader != JnjvmClassLoader::bootstrapLoader) {
-      // We know the array class can belong to bootstrap
-      CommonClass* cl = JnjvmClassLoader::bootstrapLoader->constructArray(classDef->name);
-      return cl->classLoader->TheModule->getClassInfo(cl)->getVar(jit);
-    }
-#endif
       
     Constant* cons = 
       ConstantExpr::getIntToPtr(ConstantInt::get(Type::Int64Ty,