[vmkit-commits] [vmkit] r78380 - in /vmkit/trunk/lib/JnJVM/Compiler: JavaAOTCompiler.cpp JavaJITOpcodes.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Fri Aug  7 03:49:05 2009
New Revision: 78380

URL: http://llvm.org/viewvc/llvm-project?rev=78380&view=rev
Log:
Don't compile arrays during AOT, unless we're comiling rt.jar.


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

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp Fri Aug  7 03:49:05 2009
@@ -39,7 +39,8 @@
     // A class is being static compiled if owner class is not null.
     return cl->asClass()->getOwnerClass() != 0;
   } else if (cl->isArray()) {
-    return isCompiling(cl->asArrayClass()->baseClass());
+    // Only compile an aray if we are compiling rt.jar.
+    return compileRT;
   } else if (cl->isPrimitive() && compileRT) {
     return true;
   } else {

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJITOpcodes.cpp Fri Aug  7 03:49:05 2009
@@ -2089,7 +2089,7 @@
         }
 
         Value* TheVT = 0;
-        if (!cl) {
+        if (!cl || TheCompiler->isStaticCompiling()) {
           TheVT = CallInst::Create(module->GetVTFromCommonClassFunction,
                                    clVar, "", currentBlock);
         } else {