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

8311583: tableswitch broken by JDK-8310577 #14788

Closed
wants to merge 4 commits into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Jul 6, 2023

I demoted some types for -Wconversion warnings but they're supposed to be larger types to catch overflow for tableswitch and lookupswitch. Restored old code (except int64_t not jlong).
Tested with tier1-4.


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-8311583: tableswitch broken by JDK-8310577 (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14788

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 6, 2023

👋 Welcome back coleenp! 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 Pull request is ready for review label Jul 6, 2023
@openjdk
Copy link

openjdk bot commented Jul 6, 2023

@coleenp 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 hotspot-runtime-dev@openjdk.org label Jul 6, 2023
@mlbridge
Copy link

mlbridge bot commented Jul 6, 2023

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Functional fix looks good. A couple of suggestions around the test.

Thanks.

src/hotspot/share/interpreter/bytecodes.cpp Show resolved Hide resolved
test/hotspot/jtreg/runtime/verifier/TestTableSwitch.java Outdated Show resolved Hide resolved
test/hotspot/jtreg/runtime/verifier/tableswitchp1.jasm Outdated Show resolved Hide resolved
test/hotspot/jtreg/runtime/verifier/lookupswitchp1.jasm Outdated Show resolved Hide resolved
Copy link
Member

@dean-long dean-long left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good except for jasm comment I suggest improving.

@openjdk
Copy link

openjdk bot commented Jul 11, 2023

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

8311583: tableswitch broken by JDK-8310577

Reviewed-by: dholmes, dlong

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

  • 489a32f: 8311813: C1: Uninitialized PhiResolver::_loop field
  • 119cc49: 8156889: ListKeychainStore.sh fails in some virtualized environments
  • ed9337e: 8155902: DataOuputStream should clarify that it might write primitive types as multiple byte groups
  • f82c818: 8308694: Clarify reversed() default methods' implementation requirements
  • 7304316: 8311926: java/lang/ScopedValue/StressStackOverflow.java takes 9mins in tier1
  • aa7367f: 8311921: Inform about MaxExpectedDataSegmentSize in case of pthread_create failures on AIX
  • 753bd56: 8311870: Split CompressedKlassPointers from compressedOops.hpp
  • 0b0e064: 8311656: Shenandoah: Unused ShenandoahSATBAndRemarkThreadsClosure::_claim_token
  • fd7fddb: 8295894: Remove SECOM certificate that is expiring in September 2023
  • d82ade3: 8310683: Refactor StandardCharset/standard.java to use JUnit
  • ... and 46 more: https://git.openjdk.org/jdk/compare/22e17c29a2a4eb546fae4c01ae435283654e3bb3...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 Pull request is ready to be integrated label Jul 11, 2023
Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nothing further from me. Thanks

@coleenp
Copy link
Contributor Author

coleenp commented Jul 13, 2023

Thank you for reviewing Dean and David, and for finding this, Dean.
/integrate

@openjdk
Copy link

openjdk bot commented Jul 13, 2023

Going to push as commit 135f64e.
Since your change was applied there have been 70 commits pushed to the master branch:

  • 6895deb: 8311536: JFR TestNativeMemoryUsageEvents fails in huge pages configuration
  • bb5278d: 8311239: GC: Remove trailing blank lines in source files
  • 92a04e2: 8311867: StructuredTaskScope.shutdown does not interrupt newly started threads
  • f60c1f9: 8294401: Update jfr man page to include recently added features
  • 1b0dd7c: 8310108: Skip ReplaceCriticalClassesForSubgraphs when EnableJVMCI is specified
  • a38a421: 8311917: MAP_FAILED definition seems to be obsolete in src/java.desktop/unix/native/common/awt/fontpath.c
  • 812dadb: 8311788: ClassLoadUnloadTest fails on AIX after JDK-8193513
  • 11a5115: 8311556: GetThreadLocalStorage not working for vthreads mounted during JVMTI attach
  • a38582e: 8311691: C2: Remove legacy code related to PostLoopMultiversioning
  • 38f7412: 8311609: [windows] Native stack printing lacks source information for dynamically loaded dlls
  • ... and 60 more: https://git.openjdk.org/jdk/compare/22e17c29a2a4eb546fae4c01ae435283654e3bb3...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 13, 2023
@openjdk openjdk bot closed this Jul 13, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 13, 2023
@openjdk
Copy link

openjdk bot commented Jul 13, 2023

@coleenp Pushed as commit 135f64e.

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

@coleenp coleenp deleted the tableswitch branch July 13, 2023 13:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
3 participants