src/hotspot/share/classfile/javaClasses.cpp

*** 435,445 ****
  
    char *native_platform_string;
    { JavaThread* thread = (JavaThread*)THREAD;
      assert(thread->is_Java_thread(), "must be java thread");
      JNIEnv *env = thread->jni_environment();
!     jstring js = (jstring) JNIHandles::make_local(env, java_string());
      bool is_copy;
      HandleMark hm(thread);
      ThreadToNativeFromVM ttn(thread);
      native_platform_string = (_to_platform_string_fn)(env, js, &is_copy);
      assert(is_copy == JNI_TRUE, "is_copy value changed");
--- 435,445 ----
  
    char *native_platform_string;
    { JavaThread* thread = (JavaThread*)THREAD;
      assert(thread->is_Java_thread(), "must be java thread");
      JNIEnv *env = thread->jni_environment();
!     jstring js = (jstring) JNIHandles::make_local(thread, java_string());
      bool is_copy;
      HandleMark hm(thread);
      ThreadToNativeFromVM ttn(thread);
      native_platform_string = (_to_platform_string_fn)(env, js, &is_copy);
      assert(is_copy == JNI_TRUE, "is_copy value changed");
*** 2842,2855 ****
  }
  
  void java_lang_StackFrameInfo::set_method_and_bci(Handle stackFrame, const methodHandle& method, int bci, TRAPS) {
    // set Method* or mid/cpref
    HandleMark hm(THREAD);
!   Handle mname(Thread::current(), stackFrame->obj_field(_memberName_offset));
    InstanceKlass* ik = method->method_holder();
    CallInfo info(method(), ik, CHECK);
!   MethodHandles::init_method_MemberName(mname, info);
    // set bci
    java_lang_StackFrameInfo::set_bci(stackFrame(), bci);
    // method may be redefined; store the version
    int version = method->constants()->version();
    assert((jushort)version == version, "version should be short");
--- 2842,2855 ----
  }
  
  void java_lang_StackFrameInfo::set_method_and_bci(Handle stackFrame, const methodHandle& method, int bci, TRAPS) {
    // set Method* or mid/cpref
    HandleMark hm(THREAD);
!   Handle mname(THREAD, stackFrame->obj_field(_memberName_offset));
    InstanceKlass* ik = method->method_holder();
    CallInfo info(method(), ik, CHECK);
!   MethodHandles::init_method_MemberName(mname, info, THREAD);
    // set bci
    java_lang_StackFrameInfo::set_bci(stackFrame(), bci);
    // method may be redefined; store the version
    int version = method->constants()->version();
    assert((jushort)version == version, "version should be short");