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

8215291: Broken links when generating from project without modules #1157

Closed
wants to merge 2 commits into from

Conversation

basil
Copy link
Contributor

@basil basil commented Jun 16, 2022

Hi all,

This pull request contains a clean backport of JDK-8215291 (openjdk/jdk@cb55317).

The commit being backported was authored by @hns on December 21, 2018, and was reviewed by @jonathan-gibbons.

See JENKINS-68761 for the motivation behind this backport.

I tested this by reproducing the search problem described in JENKINS-68761 on jdk11u-dev and verified that I could no longer reproduce the problem after backporting this commit.

Thanks!


Progress

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

Issue

  • JDK-8215291: Broken links when generating from project without modules

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1157

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 16, 2022

👋 Welcome back basil! 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 changed the title Backport cb553175b7c8248ab89738a7694ea72026027198 8215291: Broken links when generating from project without modules Jun 16, 2022
@openjdk
Copy link

openjdk bot commented Jun 16, 2022

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

@openjdk
Copy link

openjdk bot commented Jun 16, 2022

@basil This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8215291: Broken links when generating from project without modules

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

  • c53e0fe: 8288467: remove memory_operand assert for spilled instructions
  • c6e2a5b: 8282555: Missing memory edge when spilling MoveF2I, MoveD2L etc
  • 87bcc4e: 8284882: SIGSEGV in Node::verify_edges due to compilation bailout
  • fb76f0e: 8283441: C2: segmentation fault in ciMethodBlocks::make_block_at(int)
  • 6fe8d8d: 8285696: AlgorithmConstraints:permits not throwing IllegalArgumentException when 'alg' is null
  • b4f0859: 8285398: Cache the results of constraint checks
  • eb8789b: 8284694: Avoid evaluating SSLAlgorithmConstraints twice
  • 97178bf: 8282214: Upgrade JQuery to version 3.6.0

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 16, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 16, 2022

Webrevs

@basil
Copy link
Contributor Author

basil commented Jun 16, 2022

I do not have JBS access. Can someone please submit the following comment with the jdk11u-fix-request label:

See JENKINS-68761 for the motivation behind this backport. I tested this by reproducing the search problem described in JENKINS-68761 on jdk11u-dev and verified that I could no longer reproduce the problem after backporting this commit. The commit applied cleanly with no conflicts.

@basil
Copy link
Contributor Author

basil commented Jun 28, 2022

@TheRealMDoerr You've helped shepherd some of my previous backports to completion, for which I am grateful. Are you interested in shepherding this one to completion? I am not sure what else I need to do from my perspective to drive this forward.

@TheRealMDoerr
Copy link
Contributor

Label and comment added. Please wait for the "jdk11u-fix-yes" label before using /integrate.

@basil
Copy link
Contributor Author

basil commented Jul 3, 2022

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jul 3, 2022
@openjdk
Copy link

openjdk bot commented Jul 3, 2022

@basil
Your change (at version 04cdcc5) is now ready to be sponsored by a Committer.

@TheRealMDoerr
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Jul 3, 2022

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

  • c53e0fe: 8288467: remove memory_operand assert for spilled instructions
  • c6e2a5b: 8282555: Missing memory edge when spilling MoveF2I, MoveD2L etc
  • 87bcc4e: 8284882: SIGSEGV in Node::verify_edges due to compilation bailout
  • fb76f0e: 8283441: C2: segmentation fault in ciMethodBlocks::make_block_at(int)
  • 6fe8d8d: 8285696: AlgorithmConstraints:permits not throwing IllegalArgumentException when 'alg' is null
  • b4f0859: 8285398: Cache the results of constraint checks
  • eb8789b: 8284694: Avoid evaluating SSLAlgorithmConstraints twice
  • 97178bf: 8282214: Upgrade JQuery to version 3.6.0

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 3, 2022

@TheRealMDoerr @basil Pushed as commit 732d9bc.

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

@basil
Copy link
Contributor Author

basil commented Jul 3, 2022

Thank you!

@basil basil deleted the JDK-8244171 branch July 3, 2022 14:40
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
2 participants