From 8da2ae79936e7dbf8a71cb1eae0cb4cc2bcfa2cc Mon Sep 17 00:00:00 2001
From: sspitsyn <unknown>
Date: Fri, 1 May 2015 12:27:01 -0700
Subject: [PATCH] 8076579: Popping a stack frame after exception breakpoint
 sets last method param to exception Summary: Null the
 InterpreterRuntime::member_name_arg_or_null return value when it is necessary
 Reviewed-by: jbachorik, coleenp, twisti

---
 src/share/vm/interpreter/interpreterRuntime.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/share/vm/interpreter/interpreterRuntime.cpp b/src/share/vm/interpreter/interpreterRuntime.cpp
index d3131baa1..7464f5888 100644
--- a/src/share/vm/interpreter/interpreterRuntime.cpp
+++ b/src/share/vm/interpreter/interpreterRuntime.cpp
@@ -1306,6 +1306,8 @@ IRT_ENTRY(void, InterpreterRuntime::member_name_arg_or_null(JavaThread* thread,
       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
-- 
GitLab