Mercurial > hg > truffle
diff src/share/vm/interpreter/interpreter.cpp @ 7125:1baf7f1e3f23
decoupled C++ Graal runtime from C1
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 03 Dec 2012 15:32:17 +0100 |
parents | 7d815d842ee0 |
children | 5d0bb7d52783 |
line wrap: on
line diff
--- a/src/share/vm/interpreter/interpreter.cpp Mon Dec 03 13:56:13 2012 +0100 +++ b/src/share/vm/interpreter/interpreter.cpp Mon Dec 03 15:32:17 2012 +0100 @@ -385,7 +385,8 @@ address AbstractInterpreter::deopt_reexecute_entry(Method* method, address bcp) { assert(method->contains(bcp), "just checkin'"); Bytecodes::Code code = Bytecodes::java_code_at(method, bcp); -#ifdef COMPILER1 +#if defined(COMPILER1) || defined(GRAAL) + if(code == Bytecodes::_athrow ) { return Interpreter::rethrow_exception_entry(); } @@ -451,7 +452,8 @@ case Bytecodes::_getstatic : case Bytecodes::_putstatic : case Bytecodes::_aastore : -#ifdef COMPILER1 +#if defined(COMPILER1) || defined(GRAAL) + //special case of reexecution case Bytecodes::_athrow : #endif