8067231: Zero builds fails after JDK-6898462

Mon, 15 Dec 2014 09:36:46 +0100

author
roland
date
Mon, 15 Dec 2014 09:36:46 +0100
changeset 7600
cae03a88934b
parent 7599
c6affd32651a
child 7601
4ebc1b290dbd

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 file | annotate | diff | comparison | revisions
     1.1 --- a/src/share/vm/interpreter/interpreterRuntime.cpp	Tue Nov 18 19:17:16 2014 +0100
     1.2 +++ b/src/share/vm/interpreter/interpreterRuntime.cpp	Mon Dec 15 09:36:46 2014 +0100
     1.3 @@ -407,7 +407,11 @@
     1.4      // during deoptimization so the interpreter needs to skip it when
     1.5      // the frame is popped.
     1.6      thread->set_do_not_unlock_if_synchronized(true);
     1.7 +#ifdef CC_INTERP
     1.8 +    return (address) -1;
     1.9 +#else
    1.10      return Interpreter::remove_activation_entry();
    1.11 +#endif
    1.12    }
    1.13  
    1.14    // Need to do this check first since when _do_not_unlock_if_synchronized

mercurial