Skip to content

JDK-8305688 jdk build --with-memory-size=1024 broken by JDK-8305100 #13378

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

Closed
wants to merge 1 commit into from

Conversation

JimLaskey
Copy link
Member

@JimLaskey JimLaskey commented Apr 6, 2023

JDK-8305100 [REDO] Clean up JavadocTokenizer included a change where comments were not copied but instead had their position tracked in the original source. This led to source buffers being held on to longer than desirable. This PR reverts the behaviour.


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-8305688: jdk build --with-memory-size=1024 broken by JDK-8305100

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13378

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 6, 2023

👋 Welcome back jlaskey! 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 Apr 6, 2023
@openjdk
Copy link

openjdk bot commented Apr 6, 2023

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

  • 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 compiler compiler-dev@openjdk.org label Apr 6, 2023
@mlbridge
Copy link

mlbridge bot commented Apr 6, 2023

Webrevs

@jonathan-gibbons
Copy link
Contributor

The changes look OK, but given it's noreg-hard, can you at least describe how this has been tested?

@JimLaskey
Copy link
Member Author

Full build, no OOM with --with-jobs=1 --with-memory-size=1024. open tier1,tier2,tier3 100% pass.

Copy link
Member

@Martin-Buchholz Martin-Buchholz left a comment

Choose a reason for hiding this comment

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

I tested this patch using the recipe in my bug report, and It Works For Me.

I'm not sufficiently qualified to review the code changes.

@openjdk
Copy link

openjdk bot commented Apr 12, 2023

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

8305688: jdk build --with-memory-size=1024 broken by JDK-8305100

Reviewed-by: martin

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

  • 425ef06: 8303923: ZipOutStream::putEntry should include an apiNote to indicate that the STORED compression method should be used when writing directory entries
  • 2bbbff2: 8305858: Resolve multiple definition of 'handleSocketError' when statically linking with JDK native libraries
  • bc15163: 8304834: Fix wrapper insertion in TestScaffold.parseArgs(String args[])
  • 19380d7: 8305324: C2: Wrong execution of vectorizing Interger.reverseBytes
  • 87017b5: 8295859: Update Manual Test Groups
  • 99a9dbc: 8305783: x86_64: Optimize AbsI and AbsL
  • d8af7a6: 8304725: AsyncGetCallTrace can cause SIGBUS on M1
  • b9bdbe9: 8305524: AArch64: Fix arraycopy issue on SVE caused by matching rule vmask_gen_sub
  • 82e8b03: 8305203: Simplify trimming operation in Region::Ideal
  • 27cf638: 8300912: Update java/nio/MappedByteBuffer/PmemTest.java to run on x86_64 only
  • ... and 42 more: https://git.openjdk.org/jdk/compare/08fbb7bb5edebbc22e0a84710894be47bd4fe332...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 Apr 12, 2023
@JimLaskey
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 13, 2023

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

  • 646b666: 8305900: Use loopback IP addresses in security policy files of httpclient tests
  • fb9a29d: 8305414: gtest/NMTGtests.java is failing various sub-tests
  • e846a1d: 8304450: [vectorapi] Refactor VectorShuffle implementation
  • 3f36dd8: 8305529: DefaultProxySelector.select(URI) in certain cases returns a List with null element
  • 425ef06: 8303923: ZipOutStream::putEntry should include an apiNote to indicate that the STORED compression method should be used when writing directory entries
  • 2bbbff2: 8305858: Resolve multiple definition of 'handleSocketError' when statically linking with JDK native libraries
  • bc15163: 8304834: Fix wrapper insertion in TestScaffold.parseArgs(String args[])
  • 19380d7: 8305324: C2: Wrong execution of vectorizing Interger.reverseBytes
  • 87017b5: 8295859: Update Manual Test Groups
  • 99a9dbc: 8305783: x86_64: Optimize AbsI and AbsL
  • ... and 46 more: https://git.openjdk.org/jdk/compare/08fbb7bb5edebbc22e0a84710894be47bd4fe332...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 13, 2023

@JimLaskey Pushed as commit 2060c8e.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compiler compiler-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants