Navigation Menu

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

8259475: Fix bad merge in compilerOracle #2002

Closed
wants to merge 1 commit into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jan 8, 2021

When reapplying JDK-8252505 to jdk/jdk, I stumbled upon the bad merge.

This was the original changeset:
openjdk/jdk16@ad456787

This was the merge:
555641e

Note that not all blocks were removed from compilerOracle.

Attention @JesperIRL.

Additional testing:

  • Patch from JDK-8252505 applies now
  • No refrerences to "blackhole" or "Blackhole" in src/hotspot now

Progress

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

Issue

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2002/head:pull/2002
$ git checkout pull/2002

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 8, 2021

👋 Welcome back shade! 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 Jan 8, 2021
@openjdk
Copy link

openjdk bot commented Jan 8, 2021

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

  • hotspot-compiler

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-compiler hotspot-compiler-dev@openjdk.org label Jan 8, 2021
@mlbridge
Copy link

mlbridge bot commented Jan 8, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Jan 8, 2021

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

8259475: Fix bad merge in compilerOracle

Reviewed-by: redestad, thartmann

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

  • b72de3c: 8259385: Cleanup unused assignment
  • 9154f64: 8254973: CompletableFuture.ThreadPerTaskExecutor does not throw NPE in #execute
  • e7c1740: 8258187: IllegalMonitorStateException in ArrayBlockingQueue
  • 11d5b04: 8258217: PriorityBlockingQueue constructor spec and behavior mismatch
  • 65ca5c6: 8048109: JToggleButton does not fire actionPerformed under certain conditions
  • 81db63e: 8259517: Incorrect test path in test cases
  • 270014a: 8234131: Miscellaneous changes imported from jsr166 CVS 2021-01
  • 63e3bd7: 8246677: LinkedTransferQueue and SynchronousQueue synchronization updates
  • 5cfa8c9: 8246585: ForkJoin updates
  • 6472104: 6278172: TextComponent.getSelectedText() throws StringIndexOutOfBoundsException
  • ... and 9 more: https://git.openjdk.java.net/jdk/compare/fc1d2a1e8e8dd76ddde7643f0177c0c44f6fcdf6...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 Jan 8, 2021
@cl4es
Copy link
Member

cl4es commented Jan 8, 2021

Looks trivial

Copy link
Member

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

@shipilev
Copy link
Member Author

/integrate

@openjdk openjdk bot closed this Jan 11, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 11, 2021
@openjdk
Copy link

openjdk bot commented Jan 11, 2021

@shipilev Since your change was applied there have been 19 commits pushed to the master branch:

  • b72de3c: 8259385: Cleanup unused assignment
  • 9154f64: 8254973: CompletableFuture.ThreadPerTaskExecutor does not throw NPE in #execute
  • e7c1740: 8258187: IllegalMonitorStateException in ArrayBlockingQueue
  • 11d5b04: 8258217: PriorityBlockingQueue constructor spec and behavior mismatch
  • 65ca5c6: 8048109: JToggleButton does not fire actionPerformed under certain conditions
  • 81db63e: 8259517: Incorrect test path in test cases
  • 270014a: 8234131: Miscellaneous changes imported from jsr166 CVS 2021-01
  • 63e3bd7: 8246677: LinkedTransferQueue and SynchronousQueue synchronization updates
  • 5cfa8c9: 8246585: ForkJoin updates
  • 6472104: 6278172: TextComponent.getSelectedText() throws StringIndexOutOfBoundsException
  • ... and 9 more: https://git.openjdk.java.net/jdk/compare/fc1d2a1e8e8dd76ddde7643f0177c0c44f6fcdf6...master

Your commit was automatically rebased without conflicts.

Pushed as commit 2806bf2.

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

@shipilev shipilev deleted the JDK-8259475-bad-merge branch January 11, 2021 16:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
3 participants