diff src/share/vm/interpreter/interpreter.cpp @ 7154:5d0bb7d52783

changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API
author Doug Simon <doug.simon@oracle.com>
date Wed, 12 Dec 2012 21:36:40 +0100
parents 1baf7f1e3f23
children 291ffc492eb6
line wrap: on
line diff
--- a/src/share/vm/interpreter/interpreter.cpp	Wed Dec 12 15:46:11 2012 +0100
+++ b/src/share/vm/interpreter/interpreter.cpp	Wed Dec 12 21:36:40 2012 +0100
@@ -394,26 +394,6 @@
   return Interpreter::deopt_entry(vtos, 0);
 }
 
-#ifdef GRAAL
-
-
-// If deoptimization happens, the interpreter should reexecute these bytecodes.
-// This function mainly helps the compilers to set up the reexecute bit.
-bool AbstractInterpreter::bytecode_should_reexecute(Bytecodes::Code code) {
-    switch (code) {
-  case Bytecodes::_invokedynamic:
-  case Bytecodes::_invokevirtual:
-  case Bytecodes::_invokeinterface:
-  case Bytecodes::_invokespecial:
-  case Bytecodes::_invokestatic:
-    return false;
-  default: 
-    return true;
-    }
-  return true;
-}
-#else 
-
 // If deoptimization happens, the interpreter should reexecute these bytecodes.
 // This function mainly helps the compilers to set up the reexecute bit.
 bool AbstractInterpreter::bytecode_should_reexecute(Bytecodes::Code code) {
@@ -452,7 +432,7 @@
     case Bytecodes::_getstatic :
     case Bytecodes::_putstatic :
     case Bytecodes::_aastore   :
-#if defined(COMPILER1) || defined(GRAAL)
+#if defined(COMPILER1)
 
     //special case of reexecution
     case Bytecodes::_athrow    :
@@ -463,7 +443,6 @@
       return false;
   }
 }
-#endif
 
 void AbstractInterpreterGenerator::bang_stack_shadow_pages(bool native_call) {
   // Quick & dirty stack overflow checking: bang the stack & handle trap.