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

8328079: JDK-8326583 broke ccache compilation #18273

Closed
wants to merge 1 commit into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Mar 13, 2024

According to #17986 (comment), JDK-8326583 broke ccache compilation.

The reason was that the ccache command line included CCACHE_SLOPPINESS=pch_defines,time_macros, and the comma was expanded wrongly, causing time_macros ... to look as an additional argument to SetIfEmpty.


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-8328079: JDK-8326583 broke ccache compilation (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18273

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 13, 2024

👋 Welcome back ihse! 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 Mar 13, 2024
@openjdk
Copy link

openjdk bot commented Mar 13, 2024

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

  • build

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 build build-dev@openjdk.org label Mar 13, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 13, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Mar 13, 2024

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

8328079: JDK-8326583 broke ccache compilation

Reviewed-by: erikj, jwaters

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

  • a4a5196: 8327872: Convert javax/swing/JToolTip/4644444/bug4644444.java applet test to main
  • da4dd7c: 8327989: java/net/httpclient/ManyRequest.java should not use "localhost" in URIs

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 the ready Pull request is ready to be integrated label Mar 13, 2024
@TheShermanTanker
Copy link
Contributor

Looks good, sorry I couldn't do this one before you did

@magicus
Copy link
Member Author

magicus commented Mar 13, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Mar 13, 2024

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

  • 7e05a70: 8251330: Reorder CDS archived heap to speed up relocation
  • 7d8561d: 8327109: Refactor data graph cloning used in create_new_if_for_predicate() into separate class
  • a4a5196: 8327872: Convert javax/swing/JToolTip/4644444/bug4644444.java applet test to main
  • da4dd7c: 8327989: java/net/httpclient/ManyRequest.java should not use "localhost" in URIs

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 13, 2024

@magicus Pushed as commit 4d64467.

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

@magicus magicus deleted the fix-ccache branch March 13, 2024 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants