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

8323274: C2: array load may float above range check #727

Closed

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Jun 14, 2024

Backport of JDK-8323274. Recognized as clean. "test/hotspot/jtreg/compiler/rangechecks" tests have passed.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8323274 needs maintainer approval

Issue

  • JDK-8323274: C2: array load may float above range check (Bug - P2 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/727/head:pull/727
$ git checkout pull/727

Update a local copy of the PR:
$ git checkout pull/727
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/727/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 727

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/727.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 14, 2024

👋 Welcome back mdoerr! 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
Copy link

openjdk bot commented Jun 14, 2024

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

8323274: C2: array load may float above range check

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

  • c08de56: 8332825: ubsan: guardedMemory.cpp:35:11: runtime error: null pointer passed as argument 2, which is declared to never be null
  • 762e983: 8317831: compiler/codecache/CheckLargePages.java fails on OL 8.8 with unexpected memory string
  • 8cb3b1f: 8269428: java/util/concurrent/ConcurrentHashMap/ToArray.java timed out
  • 710a0b0: 8327787: Convert javax/swing/border/Test4129681.java applet test to main
  • 28c16d4: 8331575: C2: crash when ConvL2I is split thru phi at LongCountedLoop
  • 8ca5280: 8322996: BoxLockNode creation fails with assert(reg < CHUNK_SIZE) failed: sanity
  • d2f857a: 8317299: safepoint scalarization doesn't keep track of the depth of the JVM state
  • 9a392ea: 8323972: C2 compilation fails with assert(!x->as_Loop()->is_loop_nest_inner_loop()) failed: loop was transformed
  • dba6716: 8321278: C2: Partial peeling fails with assert "last_peel <- first_not_peeled"

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.

@openjdk openjdk bot changed the title Backport 4406915ebce4266b3eb4a238382fff3c2c1d1739 8323274: C2: array load may float above range check Jun 14, 2024
@openjdk
Copy link

openjdk bot commented Jun 14, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk
Copy link

openjdk bot commented Jun 14, 2024

⚠️ @TheRealMDoerr This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 14, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 14, 2024

Webrevs

@TheRealMDoerr
Copy link
Contributor Author

/approval request Should get backported for parity with 21.0.5-oracle. Recognized as clean and tier 1-4 have passed.

@openjdk
Copy link

openjdk bot commented Jun 15, 2024

@TheRealMDoerr
8323274: The approval request has been created successfully.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Jun 15, 2024
@TheRealMDoerr
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 17, 2024

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

  • c08de56: 8332825: ubsan: guardedMemory.cpp:35:11: runtime error: null pointer passed as argument 2, which is declared to never be null
  • 762e983: 8317831: compiler/codecache/CheckLargePages.java fails on OL 8.8 with unexpected memory string
  • 8cb3b1f: 8269428: java/util/concurrent/ConcurrentHashMap/ToArray.java timed out
  • 710a0b0: 8327787: Convert javax/swing/border/Test4129681.java applet test to main
  • 28c16d4: 8331575: C2: crash when ConvL2I is split thru phi at LongCountedLoop
  • 8ca5280: 8322996: BoxLockNode creation fails with assert(reg < CHUNK_SIZE) failed: sanity
  • d2f857a: 8317299: safepoint scalarization doesn't keep track of the depth of the JVM state
  • 9a392ea: 8323972: C2 compilation fails with assert(!x->as_Loop()->is_loop_nest_inner_loop()) failed: loop was transformed
  • dba6716: 8321278: C2: Partial peeling fails with assert "last_peel <- first_not_peeled"

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 17, 2024

@TheRealMDoerr Pushed as commit a1e43d9.

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

@TheRealMDoerr TheRealMDoerr deleted the 8323274_C2_array_load branch June 17, 2024 09:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

1 participant