8292499: CDS ArchivedEnumTest.java fails: object points to a static field that may be reinitialized

[iklam]

Plrease review this trivial PR:

The self-diagnostic test in CDS is too strict. AccessFlag$Location::EMPTY_SET is the same archived object as ImmutableCollections::EMPTY_SET, so at runtime we can guarantee the object equality of these two static fields.

This PR fixes the immediate problem, so that with java -Xshare:dump you won't see spurious warning messages. I am working on a more comprehensive fix in JDK-8292635

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8292499: CDS ArchivedEnumTest.java fails: object points to a static field that may be reinitialized

Reviewers

• David Holmes (@dholmes-ora - Reviewer)
• Calvin Cheung (@calvinccheung - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9926

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/9926.diff

[bridgekeeper]

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

[openjdk]

@iklam The following label will be automatically applied to this pull request:

• hotspot-runtime

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 00: Full (9508ed24)

[dholmes-ora]

I can't say I understand the underlying issue that CDSHeapVerifier deals with, but adding this additional exclusion seems fine and trivial.

Thanks.

[openjdk]

@iklam 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:

8292499: CDS ArchivedEnumTest.java fails: object points to a static field that may be reinitialized

Reviewed-by: dholmes, ccheung

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 6 new commits pushed to the master branch:

• f85411f: 8292458: Atomic operations on scoped enums don't build with clang
• 82dbe29: 8292633: runtime/cds/appcds/dynamicArchive/CDSStreamTestDriver.java fails to compile
• 54ce114: 6587699: Document DigestInputStream behavior when skip() or mark() / reset() is used
• a1df2da: 8292632: compiler/sharedstubs/SharedTrampolineTest.java fails with "Error: VM option 'PrintRelocations' is develop and is available only in debug version of VM."
• 1b756bf: 8236048: Cleanup use of Utils.normalizeNewlines
• 97e2689: 8288121: [JVMCI] Re-export the TerminatingThreadLocal functionality to the graal compiler.

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 master branch, type /integrate in a new comment.

[calvinccheung]

LGTM. I've tried this patch and it works.

[iklam]

Thanks @calvinccheung and @dholmes-ora for the review.
/integrate

[openjdk]

Going to push as commit 964aac2.
Since your change was applied there have been 6 commits pushed to the master branch:

• f85411f: 8292458: Atomic operations on scoped enums don't build with clang
• 82dbe29: 8292633: runtime/cds/appcds/dynamicArchive/CDSStreamTestDriver.java fails to compile
• 54ce114: 6587699: Document DigestInputStream behavior when skip() or mark() / reset() is used
• a1df2da: 8292632: compiler/sharedstubs/SharedTrampolineTest.java fails with "Error: VM option 'PrintRelocations' is develop and is available only in debug version of VM."
• 1b756bf: 8236048: Cleanup use of Utils.normalizeNewlines
• 97e2689: 8288121: [JVMCI] Re-export the TerminatingThreadLocal functionality to the graal compiler.

Your commit was automatically rebased without conflicts.

[openjdk]

@iklam Pushed as commit 964aac2.

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