changeset 7584:a733dad6fc1e

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>
author roland
date Mon, 15 Dec 2014 09:36:46 +0100
parents db035d4ba1bd
children 71f90d9cdd8f
files src/share/vm/interpreter/interpreterRuntime.cpp
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/interpreter/interpreterRuntime.cpp	Sat Dec 13 01:24:10 2014 +0300
+++ b/src/share/vm/interpreter/interpreterRuntime.cpp	Mon Dec 15 09:36:46 2014 +0100
@@ -394,7 +394,11 @@
     // 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