Skip to content
This repository has been archived by the owner on Apr 24, 2023. It is now read-only.

8298059: Linked stack watermarks don't support nesting #38

Closed
wants to merge 2 commits into from

Conversation

fisk
Copy link
Contributor

@fisk fisk commented Dec 15, 2022

Hi all,

This pull request contains a backport of commit b17c5242 from the openjdk/jdk repository.

The commit being backported was authored by Erik Österlund on 15 Dec 2022 and was reviewed by Stefan Karlsson, Serguei Spitsyn, Robbin Ehn and Patricio Chilano Mateo.

Thanks!


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-8298059: Linked stack watermarks don't support nesting

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 38

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk20/pull/38.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 15, 2022

👋 Welcome back eosterlund! 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 b17c52422c91ad1e7ff35844676f6269a1b87f79 8298059: Linked stack watermarks don't support nesting Dec 15, 2022
@openjdk
Copy link

openjdk bot commented Dec 15, 2022

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

@openjdk
Copy link

openjdk bot commented Dec 15, 2022

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

8298059: Linked stack watermarks don't support nesting

Reviewed-by: stefank

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

  • e15bdc5: 8299789: Compilation of gtest causes build to fail if runtime libraries are in different dirs
  • 87865e0: 8299502: Usage of constructors of primitive wrapper classes should be avoided in javax.xml API docs
  • dc5cc61: 8299499: Usage of constructors of primitive wrapper classes should be avoided in java.net API docs
  • 98eae6d: 8299500: Usage of constructors of primitive wrapper classes should be avoided in java.text API docs
  • 628266a: 8299501: Usage of constructors of primitive wrapper classes should be avoided in java.util API docs
  • ab7f43f: 8299498: Usage of constructors of primitive wrapper classes should be avoided in java.lang API docs
  • bc498f8: 8300141: ProblemList java/util/concurrent/locks/Lock/OOMEInAQS.java with ZGC

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 added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 15, 2022
@openjdk
Copy link

openjdk bot commented Dec 15, 2022

@fisk 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 Dec 15, 2022
@mlbridge
Copy link

mlbridge bot commented Dec 15, 2022

Webrevs

@fisk
Copy link
Contributor Author

fisk commented Dec 16, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Dec 16, 2022

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

  • 03a694a: 8298083: The "CheckBox/RadioButton[Enabled/Disabled].textForeground" stoped working
  • c7d7e7e: 8298888: ProblemList gc/g1/TestVerifyGCType.java on linux and macosx
  • ca39eb9: 7093322: (fs spec) Files.newBufferedWriter should be clear when coding errors are detected
  • 2c42499: 8298050: Add links to graph output for javadoc
  • 48f6127: 8298376: ZGC: thaws stackChunk with stale oops
  • 22a6b59: 8298727: Trees.getPath may crash for unnamed package
  • 323e574: 8298371: monitors_on_stack extracts unprocessed oops

It was not possible to rebase your changes automatically. Please merge master into your branch and try again.

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 13, 2023

@fisk This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@openjdk openjdk bot removed clean ready Pull request is ready to be integrated labels Jan 17, 2023
@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 17, 2023
@fisk
Copy link
Contributor Author

fisk commented Jan 17, 2023

Thanks for the review, @stefank!

@fisk
Copy link
Contributor Author

fisk commented Jan 17, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jan 17, 2023

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

  • e15bdc5: 8299789: Compilation of gtest causes build to fail if runtime libraries are in different dirs
  • 87865e0: 8299502: Usage of constructors of primitive wrapper classes should be avoided in javax.xml API docs
  • dc5cc61: 8299499: Usage of constructors of primitive wrapper classes should be avoided in java.net API docs
  • 98eae6d: 8299500: Usage of constructors of primitive wrapper classes should be avoided in java.text API docs
  • 628266a: 8299501: Usage of constructors of primitive wrapper classes should be avoided in java.util API docs
  • ab7f43f: 8299498: Usage of constructors of primitive wrapper classes should be avoided in java.lang API docs
  • bc498f8: 8300141: ProblemList java/util/concurrent/locks/Lock/OOMEInAQS.java with ZGC

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 17, 2023

@fisk Pushed as commit ae0e027.

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
2 participants