--- old/src/share/vm/interpreter/interpreter.cpp	2015-09-16 15:18:41.000000000 -0700
+++ new/src/share/vm/interpreter/interpreter.cpp	2015-09-16 15:18:41.000000000 -0700
@@ -447,7 +447,7 @@
 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) || INCLUDE_JVMCI
   if(code == Bytecodes::_athrow ) {
     return Interpreter::rethrow_exception_entry();
   }