--- a/hotspot/src/share/vm/interpreter/interpreter.cpp	Thu Oct 15 13:28:22 2015 +0200
+++ b/hotspot/src/share/vm/interpreter/interpreter.cpp	Sat Oct 17 19:40:30 2015 -0400
@@ -459,11 +459,11 @@
 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();
   }
-#endif /* COMPILER1 */
+#endif /* COMPILER1 || INCLUDE_JVMCI */
   return Interpreter::deopt_entry(vtos, 0);
 }