diff -r 1709e0e0b87c -r e3a2b513713a hotspot/src/share/vm/c1/c1_Instruction.cpp
--- a/hotspot/src/share/vm/c1/c1_Instruction.cpp	Thu Feb 20 16:38:45 2014 -0500
+++ b/hotspot/src/share/vm/c1/c1_Instruction.cpp	Sat Feb 22 10:22:05 2014 +0100
@@ -76,7 +76,7 @@
 
 void Instruction::update_exception_state(ValueStack* state) {
   if (state != NULL && (state->kind() == ValueStack::EmptyExceptionState || state->kind() == ValueStack::ExceptionState)) {
-    assert(state->kind() == ValueStack::EmptyExceptionState || Compilation::current()->env()->jvmti_can_access_local_variables(), "unexpected state kind");
+    assert(state->kind() == ValueStack::EmptyExceptionState || Compilation::current()->env()->should_retain_local_variables(), "unexpected state kind");
     _exception_state = state;
   } else {
     _exception_state = NULL;