Mercurial > hg > graal-jvmci-8
changeset 23003:0f0188a02ecb
Merge
author | coleenp |
---|---|
date | Mon, 04 May 2015 16:53:05 +0000 |
parents | ed0067c67bd7 (current diff) 37d4d581f698 (diff) |
children | 9a23a160ca57 |
files | |
diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/interpreter/interpreterRuntime.cpp Tue Apr 28 19:04:39 2015 +0900 +++ b/src/share/vm/interpreter/interpreterRuntime.cpp Mon May 04 16:53:05 2015 +0000 @@ -1306,6 +1306,8 @@ member_name_oop = java_lang_invoke_DirectMethodHandle::member(member_name_oop); } thread->set_vm_result(member_name_oop); + } else { + thread->set_vm_result(NULL); } IRT_END #endif // INCLUDE_JVMTI