[vmkit-commits] [vmkit] r65780 - /vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Sun Mar  1 11:33:44 2009
New Revision: 65780

URL: http://llvm.org/viewvc/llvm-project?rev=65780&view=rev
Log:
Optimization of final fields does not work on ISOLATE environments.


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

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp Sun Mar  1 11:33:44 2009
@@ -1643,8 +1643,9 @@
   
   Value* ptr = ldResolved(index, true, 0, type, LAI.llvmTypePtr);
   
-  JnjvmBootstrapLoader* JBL = compilingClass->classLoader->bootstrapLoader;
   bool final = false;
+#if !defined(ISOLATE) && !defined(ISOLATE_SHARING)
+  JnjvmBootstrapLoader* JBL = compilingClass->classLoader->bootstrapLoader;
   if (!compilingMethod->name->equals(JBL->clinitName)) {
     JavaField* field = compilingClass->ctpInfo->lookupField(index, true);
     if (field && field->classDef->isReady()) final = isFinal(field->access);
@@ -1686,6 +1687,7 @@
       }
     }
   }
+#endif
 
   if (!final) push(new LoadInst(ptr, "", currentBlock), sign->isUnsigned());
   if (type == Type::Int64Ty || type == Type::DoubleTy) {