1.1 --- a/src/share/vm/c1/c1_GraphBuilder.cpp Tue Jun 02 14:29:43 2020 +0800
1.2 +++ b/src/share/vm/c1/c1_GraphBuilder.cpp Sat Feb 22 10:22:05 2014 +0100
1.3 @@ -2376,7 +2376,7 @@
1.4 if (!has_handler() && (!instruction->needs_exception_state() || instruction->exception_state() != NULL)) {
1.5 assert(instruction->exception_state() == NULL
1.6 || instruction->exception_state()->kind() == ValueStack::EmptyExceptionState
1.7 - || (instruction->exception_state()->kind() == ValueStack::ExceptionState && _compilation->env()->jvmti_can_access_local_variables()),
1.8 + || (instruction->exception_state()->kind() == ValueStack::ExceptionState && _compilation->env()->should_retain_local_variables()),
1.9 "exception_state should be of exception kind");
1.10 return new XHandlers();
1.11 }
1.12 @@ -2467,7 +2467,7 @@
1.13 // This scope and all callees do not handle exceptions, so the local
1.14 // variables of this scope are not needed. However, the scope itself is
1.15 // required for a correct exception stack trace -> clear out the locals.
1.16 - if (_compilation->env()->jvmti_can_access_local_variables()) {
1.17 + if (_compilation->env()->should_retain_local_variables()) {
1.18 cur_state = cur_state->copy(ValueStack::ExceptionState, cur_state->bci());
1.19 } else {
1.20 cur_state = cur_state->copy(ValueStack::EmptyExceptionState, cur_state->bci());
1.21 @@ -3353,7 +3353,7 @@
1.22 ValueStack* GraphBuilder::copy_state_for_exception_with_bci(int bci) {
1.23 ValueStack* s = copy_state_exhandling_with_bci(bci);
1.24 if (s == NULL) {
1.25 - if (_compilation->env()->jvmti_can_access_local_variables()) {
1.26 + if (_compilation->env()->should_retain_local_variables()) {
1.27 s = state()->copy(ValueStack::ExceptionState, bci);
1.28 } else {
1.29 s = state()->copy(ValueStack::EmptyExceptionState, bci);
