[vmkit-commits] [vmkit] r140274 - /vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Wed Sep 21 15:38:12 2011
New Revision: 140274

URL: http://llvm.org/viewvc/llvm-project?rev=140274&view=rev
Log:
Don't inline virtual methods that overwrite 'this'.

Modified:
    vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp

Modified: vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp?rev=140274&r1=140273&r2=140274&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp Wed Sep 21 15:38:12 2011
@@ -2917,13 +2917,17 @@
       case FSTORE_1 :
       case FSTORE_2 :
       case FSTORE_3 :
-      case ASTORE_0 :
       case ASTORE_1 :
       case ASTORE_2 :
       case ASTORE_3 :
         stack.pop_back();
         break;
 
+      case ASTORE_0 :
+        stack.pop_back();
+        if (!isStatic(compilingMethod->access)) return false;
+        break;
+
       case DSTORE_0 :
       case DSTORE_1 :
       case DSTORE_2 :