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

[Volker Simonis]

Thanks a lot Albert,
Volker

On Tue, May 6, 2014 at 11:31 AM, Albert <albert.noll at oracle.com> wrote:
> Hi Volker,
>
> I can push your changes. I think one review should do it.
>
> Best,
> Albert
>
>
> On 05/06/2014 11:23 AM, Volker Simonis wrote:
>>
>> Right. As far as I can see, hs-comp is the the only repository where
>> the offending change "8036956: remove EnableInvokeDynamic flag" has
>> been applied so far.
>>
>> It would be good if this fix could be pushed to hs-comp before hs-comp
>> will be pushed down to jdk9/dev to avoid build failures of the
>> C++-Interpreter in the subsequent forests.
>>
>> Thanks,
>> Volker
>>
>> On Tue, May 6, 2014 at 11:17 AM, Staffan Larsen
>> <staffan.larsen at oracle.com> wrote:
>>>
>>> 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
>
>