Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8276825: hotspot/runtime/SelectionResolution test errors #6300

Closed
wants to merge 2 commits into from

Conversation

hseigel
Copy link
Member

@hseigel hseigel commented Nov 8, 2021

Please review this trivial fix to a few of the hotspot/runtime/SelectionResolution test class files. The fix was tested by running the tests locally and Mach5 tiers 1-3 on Linux, MacOS, and Windows.

Thanks, Harold


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8276825: hotspot/runtime/SelectionResolution test errors

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6300/head:pull/6300
$ git checkout pull/6300

Update a local copy of the PR:
$ git checkout pull/6300
$ git pull https://git.openjdk.java.net/jdk pull/6300/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6300

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6300.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 8, 2021

👋 Welcome back hseigel! 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 openjdk bot added the rfr label Nov 8, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 8, 2021

@hseigel 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.

@openjdk openjdk bot added the hotspot-runtime label Nov 8, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 8, 2021

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Hi Harold,

The fix looks good but I'm unclear about the exact circumstances here. Were these tests failing? If so were they excluded somehow? Or were these still passing by accident - which indicates a bigger problem with the test?

Thanks,
David

@openjdk
Copy link

@openjdk openjdk bot commented Nov 9, 2021

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

8276825: hotspot/runtime/SelectionResolution test errors

Reviewed-by: dholmes, shade

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

  • e91e9d8: 8276721: G1: Refine G1EvacFailureObjectsSet::iterate
  • 8822d41: 8274736: Concurrent read/close of SSLSockets causes SSLSessions to be invalidated unnecessarily
  • c1e41fe: 8276842: G1: Only calculate size in bytes from words when needed
  • c8b0ee6: 8276833: G1: Make G1EvacFailureRegions::par_iterate const
  • 0699220: 8268882: C2: assert(n->outcnt() != 0 || C->top() == n || n->is_Proj()) failed: No dead instructions after post-alloc
  • d7012fb: 8276880: Remove java/lang/RuntimeTests/exec/ExecWithDir as unnecessary
  • f9024d0: 8230130: javadoc search result dialog shows cut off headers for long results
  • 055de6f: 8223358: Incorrect HTML structure in annotation pages
  • a60e912: 8198626: java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html fails on mac
  • dde959d: 8276808: java/nio/channels/Channels/TransferTo.java timed out
  • ... and 20 more: https://git.openjdk.java.net/jdk/compare/71c4b195178029f5414fa45d2c5ac70a1d2536e5...master

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.

@openjdk openjdk bot added the ready label Nov 9, 2021
Copy link
Contributor

@shipilev shipilev left a comment

Looks fine to me.

@hseigel
Copy link
Member Author

@hseigel hseigel commented Nov 9, 2021

Thanks David and Aleksey for the reviews.

The tests passed by accident. The calls to the Clazz constructor happen to succeed because the constructor adds ACC_SUPER to the incoming access. When the access is -1, this results in access being set to 31 because ACC_SUPER equals 32.

I changed the Clazz cosntructor java to 'or' the incoming access with ACC_SUPER instead of adding it. This will prevent the test from succeeding in the future if an index of -1 is passsed as the access.

Does this latest change look okay?

@dholmes-ora
Copy link
Member

@dholmes-ora dholmes-ora commented Nov 10, 2021

So does that mean we check access by AND'ing with a mask ie

bool is_public = access_bits & ACC_PUBLIC != 0

So access bits of 31 are the same as 1 from an access check perspective?

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Changes seem fine.

Thanks,
David

@hseigel
Copy link
Member Author

@hseigel hseigel commented Nov 10, 2021

Thanks David!

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 10, 2021

Going to push as commit 55b36c6.
Since your change was applied there have been 37 commits pushed to the master branch:

  • 0f23c6a: 8276926: Use String.valueOf() when initializing File.separator and File.pathSeparator
  • a0b8445: 8276846: JDK-8273416 is incomplete for UseSSE=1
  • a3f710e: 8276215: Intrinsics matchers should handle native method flags better
  • 0f463a7: 8276845: (fs) java/nio/file/spi/SetDefaultProvider.java fails on x86_32
  • e01d6d0: 8276679: Malformed Javadoc inline tags in JDK source in javax/swing
  • fd0a25e: 8276805: java/awt/print/PrinterJob/CheckPrivilege.java fails due to disabled SecurityManager
  • 403f318: 8276854: Windows GHA builds fail due to broken Cygwin
  • e91e9d8: 8276721: G1: Refine G1EvacFailureObjectsSet::iterate
  • 8822d41: 8274736: Concurrent read/close of SSLSockets causes SSLSessions to be invalidated unnecessarily
  • c1e41fe: 8276842: G1: Only calculate size in bytes from words when needed
  • ... and 27 more: https://git.openjdk.java.net/jdk/compare/71c4b195178029f5414fa45d2c5ac70a1d2536e5...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 10, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Nov 10, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 10, 2021

@hseigel Pushed as commit 55b36c6.

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

@hseigel
Copy link
Member Author

@hseigel hseigel commented Nov 10, 2021

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime integrated
3 participants