Mercurial > jdk8-mips64-public > hotspot / changeset

changeset

Merge

Mon, 04 May 2015 16:53:05 +0000

author
coleenp
date
Mon, 04 May 2015 16:53:05 +0000
changeset 7807
0f0188a02ecb
parent 7806
ed0067c67bd7
parent 7805
37d4d581f698
child 7808
9a23a160ca57

Merge

     1.1 --- a/src/share/vm/interpreter/interpreterRuntime.cpp	Tue Apr 28 19:04:39 2015 +0900
     1.2 +++ b/src/share/vm/interpreter/interpreterRuntime.cpp	Mon May 04 16:53:05 2015 +0000
     1.3 @@ -1306,6 +1306,8 @@
     1.4        member_name_oop = java_lang_invoke_DirectMethodHandle::member(member_name_oop);
     1.5      }
     1.6      thread->set_vm_result(member_name_oop);
     1.7 +  } else {
     1.8 +    thread->set_vm_result(NULL);
     1.9    }
    1.10  IRT_END
    1.11  #endif // INCLUDE_JVMTI

Mercurial Repository: jdk8-mips64-public/hotspot

mercurial