RFR #2 (S) CR 8015270: @Contended: fix multiple issues in the layout code

[Daniel D. Daugherty]

On 5/25/13 1:35 AM, Aleksey Shipilev wrote:
> Hi,
>
> Here's the merged changeset:
>    http://cr.openjdk.java.net/~shade/8015270/webrev.01/

Thumbs up!

hotspot/src/share/vm/classfile/classFileParser.cpp
     Thanks for adding comments.

hotspot/test/runtime/contended/HasNonStatic.java
hotspot/test/runtime/contended/OopMaps.java
     It would be good to update JDK-8015270 with information about
     what happens when these tests are run on a VM/JDK that does
     not have the fix. That will help with the bug fix verification
     process.


JBS/administrivia issues:

I bumped JDK-8015270 to P2 since JDK-8014886 is a P2.

Maybe I'm wrong, but I think the 'duplicate state' in the bugs
is backwards:

This is the umbrella bug that is unresolved:

     JDK-8015270 @Contended: fix multiple issues in the layout code

and it is 'duplicated by':

     JDK-8014886 @Contended fields can overrun oop maps
     JDK-8014964 @Contended breaks has_nonstatic_fields invariant

I believe the correct 'duplicate state' is:

     JDK-8015270 duplicates JDK-8014886
     JDK-8015270 duplicates JDK-8014964

since JDK-8015270 is the bug that is going to be used to get
the work done.

Dan



>
> Summary:
>   - has_nonstatic_fields bug fixed
>   - oop_map overrun is fixed
>   - parsed_annotations->in_contended() cleaned up
>   - asserts added to cover the regression tests
>
> Testing:
>   - all HS regression tests
>       (have a few environmental failures, but nothing new)
>   - full JPRT cycle against hotspot-rt
>       (passes OK)
>   - vm.quick.testlist (Solaris, Linux, Mac OS X, Windows)
>       (no new failures)
>   - vm.runtime.testlist (Solaris, Linux, Windows)
>       (no new failures)
>
> Thanks to Igor Ignatyev for helping running those tests without getting
> any environmental failures.
>
> -Aleksey.