changeset 7118:cae03a88934b

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 c6affd32651a
children 4ebc1b290dbd
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	Tue Nov 18 19:17:16 2014 +0100
+++ b/src/share/vm/interpreter/interpreterRuntime.cpp	Mon Dec 15 09:36:46 2014 +0100
@@ -407,7 +407,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