RFR(XXS): 8042443: Fix C++-Interpreter after "8036956: remove EnableInvokeDynamic flag"

[Staffan Larsen]

Looks good to me. I guess this should go into hs-comp?

/Staffan

On 6 maj 2014, at 11:14, Volker Simonis <volker.simonis at gmail.com> wrote:

> Hi,
> 
> could somebody please review and sponsor this one-line change which
> fixes the C++-Interpreter build after change "8036956: remove
> EnableInvokeDynamic flag" introduced a bogus "}" in
> bytecodeInterpreter.cpp:
> 
> http://cr.openjdk.java.net/~simonis/webrevs/8042443/
> https://bugs.openjdk.java.net/browse/JDK-8042443
> 
> Change "8036956: remove EnableInvokeDynamic flag" introduced a bogus
> "}" which prevents the C++-Interpreter from building. The fix is
> trivial:
> 
> diff -r 5f1e8fe1a4af src/share/vm/interpreter/bytecodeInterpreter.cpp
> --- a/src/share/vm/interpreter/bytecodeInterpreter.cpp  Tue May 06
> 09:13:36 2014 +0200
> +++ b/src/share/vm/interpreter/bytecodeInterpreter.cpp  Tue May 06
> 10:50:32 2014 +0200
> @@ -508,7 +508,6 @@
> #ifdef ASSERT
>   if (istate->_msg != initialize) {
>     assert(labs(istate->_stack_base - istate->_stack_limit) ==
> (istate->_method->max_stack() + 1), "bad stack limit");
> -  }
> #ifndef SHARK
>     IA32_ONLY(assert(istate->_stack_limit ==
> istate->_thread->last_Java_sp() + 1, "wrong"));
> #endif // !SHARK
> 
> 
> Thank you and best regards,
> Volker