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

[Nicolas Geoffray]

Author: geoffray
Date: Tue Jul 21 11:51:28 2009
New Revision: 76581

URL: http://llvm.org/viewvc/llvm-project?rev=76581&view=rev
Log:
Don't output an object direclty in the native code.


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=76581&r1=76580&r2=76581&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp Tue Jul 21 11:51:28 2009
@@ -1850,9 +1850,16 @@
           abort();
         }
       } else {
-        JavaObject* val = field->getObjectField(Obj);
-        Value* V = TheCompiler->getFinalObject(val);
-        push(V, false);
+        if (TheCompiler->isStaticCompiling()) {
+          JavaObject* val = field->getObjectField(Obj);
+          Value* V = TheCompiler->getFinalObject(val);
+          push(V, false);
+        } else {
+          Value* V = CallInst::Create(module->GetFinalObjectFieldFunction, ptr,
+                                      "", currentBlock);
+          
+          push(V, false);
+        } 
       }
     }
   }