src/share/vm/c1/c1_Instruction.cpp

rev 5933 : 8035493: JVMTI PopFrame capability must instruct compilers not to prune locals
Reviewed-by: kvn, sla, coleenp

*** 74,84 ****
    return eql;
  }
  
  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");
      _exception_state = state;
    } else {
      _exception_state = NULL;
    }
  }
--- 74,84 ----
    return eql;
  }
  
  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()->should_retain_local_variables(), "unexpected state kind");
      _exception_state = state;
    } else {
      _exception_state = NULL;
    }
  }