# HG changeset patch # User roland # Date 1418632606 -3600 # Node ID cae03a88934b57bd50506a55f6b1137f2b890765 # Parent c6affd32651aaa7739f9adcfc311d767013b668f 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 diff -r c6affd32651a -r cae03a88934b src/share/vm/interpreter/interpreterRuntime.cpp --- 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