Mercurial > jdk8-mips64-public > hotspot / changeset

changeset

Merge

Sat, 02 May 2015 00:20:54 +0000

author
coleenp
date
Sat, 02 May 2015 00:20:54 +0000
changeset 7805
37d4d581f698
parent 7804
7a4abf4cbade
parent 7803
9dc350b9e498
child 7807
0f0188a02ecb

Merge

     1.1 --- a/src/share/vm/interpreter/interpreterRuntime.cpp	Tue Feb 18 09:54:24 2014 -0500
     1.2 +++ b/src/share/vm/interpreter/interpreterRuntime.cpp	Sat May 02 00:20:54 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