RFR (S) CR 8014964: @Contended breaks has_nonstatic_fields invariant

[Vladimir Kozlov]

In assert you don't need to test nonstatic_field_size > 0 because you tested it for 0 already so other tests will be 
executed only when it is != 0.
I don't understand why you don't check has_nonstatic_fields when parsed_annotations->is_contended(). With the fix 
has_nonstatic_fields also includes contended fields so it does not matter if you have annotation or not.

Thanks,
Vladimir

On 5/21/13 4:35 AM, Aleksey Shipilev wrote:
> Hi,
>
> This is the fix for another issue found during the review:
>     http://cr.openjdk.java.net/~shade/8014964/webrev.01/
>
> This is the minimal fix which brings has_nonstatic_fields in order. The
> whole method needs refactoring anyway to untangle *_count mess. I would
> nevertheless commit this minimal fix to solve the immediate problem
> while I'm working on further cleanups.
>
> Testing:
>    - adhoc Linux x86_64/fastdebug test/runtime/contended tests
>    - full JPRT cycle against hotspot-rt is running now
>
> Thanks,
> -Aleksey.
>