8067231: Zero builds fails after JDK-6898462
authorroland
Mon, 15 Dec 2014 09:36:46 +0100
changeset 28196 6ba2bd76ea84
parent 28195 e727e721322e
child 28197 0be7e4bd3a59
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>
hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp	Sat Dec 13 01:24:10 2014 +0300
+++ b/hotspot/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