From d223357e4206f177fdd5af2f981182baebcbc78c Mon Sep 17 00:00:00 2001
From: roland <unknown>
Date: Mon, 15 Dec 2014 09:36:46 +0100
Subject: [PATCH] 8067231: Zero builds fails after JDK-6898462 Summary:
 Interpreter::remove_activation_entry() is not defined for the C++ interpreter
 Reviewed-by: roland, coleenp Contributed-by: Severin Gehwolf
 <sgehwolf@redhat.com>

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

diff --git a/src/share/vm/interpreter/interpreterRuntime.cpp b/src/share/vm/interpreter/interpreterRuntime.cpp
index 9a89c7a09..d3131baa1 100644
--- a/src/share/vm/interpreter/interpreterRuntime.cpp
+++ b/src/share/vm/interpreter/interpreterRuntime.cpp
@@ -407,7 +407,11 @@ IRT_ENTRY(address, InterpreterRuntime::exception_handler_for_exception(JavaThrea
     // during deoptimization so the interpreter needs to skip it when
     // the frame is popped.
     thread->set_do_not_unlock_if_synchronized(true);
+#ifdef CC_INTERP
+    return (address) -1;
+#else
     return Interpreter::remove_activation_entry();
+#endif
   }
 
   // Need to do this check first since when _do_not_unlock_if_synchronized
-- 
GitLab