8370886: [lworld] 8369296 partially reverted for resolving static get/put field

[coleenp]

Reordered the conditionals so that unresolved static final fields do not have their resolution set during so that their strictness can be validated (write before read, no write after read).

This should work with JDK-8334898 when merged because this change will not fill in the cpCache for statics if they're strict final statics:

Tested with tier1-4 (in progress). Tested command line the cds test that failed and valhalla/inlinetypes tests.

---

Progress

• Change must not contain extraneous whitespace

Issue

• JDK-8370886: [lworld] 8369296 partially reverted for resolving static get/put field (Bug - P4)

Reviewers

• Matias Saavedra Silva (@matias9927 - Committer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/valhalla.git pull/1723/head:pull/1723
$ git checkout pull/1723

Update a local copy of the PR:
$ git checkout pull/1723
$ git pull https://git.openjdk.org/valhalla.git pull/1723/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1723

View PR using the GUI difftool:
$ git pr show -t 1723

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/valhalla/pull/1723.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back coleenp! A progress list of the required criteria for merging this PR into lworld will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@coleenp This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8370886: [lworld] 8369296 partially reverted for resolving static get/put field

Reviewed-by: matsaave

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 102 new commits pushed to the lworld branch:

• f57d72f: 8371560: [lworld] Disable check_symmetrical until JDK-8332406 is fixed
• a180fef: 8371398: [lworld] runtime/valhalla/inlinetypes/FlatArrayCopyingTest.java#g1 fails due to lack of UnlockDiagnosticVMOptions
• 296fe86: 8341771: [lworld] Heap dump recognizing new flat fields formats
• ... and 99 more: https://git.openjdk.org/valhalla/compare/1cb010221d0df2d05273c412b385a26a5978f477...lworld

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the lworld branch, type /integrate in a new comment.

[mlbridge]

Webrevs

• 00: Full (0edd8490)

[matias9927]

LGTM!

[coleenp]

Thanks for the review Matias.
/integrate

[openjdk]

Going to push as commit a680c71.
Since your change was applied there have been 102 commits pushed to the lworld branch:

• f57d72f: 8371560: [lworld] Disable check_symmetrical until JDK-8332406 is fixed
• a180fef: 8371398: [lworld] runtime/valhalla/inlinetypes/FlatArrayCopyingTest.java#g1 fails due to lack of UnlockDiagnosticVMOptions
• 296fe86: 8341771: [lworld] Heap dump recognizing new flat fields formats
• ... and 99 more: https://git.openjdk.org/valhalla/compare/1cb010221d0df2d05273c412b385a26a5978f477...lworld

Your commit was automatically rebased without conflicts.

[openjdk]

@coleenp Pushed as commit a680c71.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.