RFR (XS): 8133557: Missing test before a branch when checking for MethodCounters in TemplateTable::branch() on x86

[Richard Reingruber]

Thank you, Coleen and Vladimir, for taking care of this.
Richard.

On 08/14/2015 09:14 PM, Coleen Phillimore wrote:
>
> I'll sponsor it.  It looks good to me also.  Thank you for finding this, and thank you Vladimir for checking the old sources.
> Coleen
>
> On 8/14/15 2:49 PM, Vladimir Kozlov wrote:
>> Fix looks correct. I looked on original 8010862 changes and templateTable_x86_32.cpp had the test instructions while templateTable_x86_64.cpp missed it.
>>
>> Someone, please, sponsor this fix.
>>
>> Thanks,
>> Vladimir
>>
>> On 8/14/15 8:01 AM, Richard Reingruber wrote:
>>> Hi,
>>>
>>> this is a request for review of the following fix for bug 8133557
>>> (https://bugs.openjdk.java.net/browse/JDK-8133557).
>>>
>>> diff -r af60f1cb36f2 src/cpu/x86/vm/templateTable_x86.cpp
>>> --- a/src/cpu/x86/vm/templateTable_x86.cpp    Mon Aug 10 10:39:19 2015
>>> -0700
>>> +++ b/src/cpu/x86/vm/templateTable_x86.cpp    Fri Aug 14 10:46:47 2015
>>> +0200
>>> @@ -2014,6 +2014,7 @@
>>>       __ pop(rcx);
>>>       __ pop(rdx);
>>>       __ movptr(rax, Address(rcx, Method::method_counters_offset()));
>>> +    __ testptr(rax, rax);
>>>       __ jcc(Assembler::zero, dispatch);
>>>       __ bind(has_counters);
>>>
>>> Thanks,
>>> Richard.
>