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

8347120: Launchers should not have java headers on include path #22953

Closed
wants to merge 2 commits into from

Conversation

erikj79
Copy link
Member

@erikj79 erikj79 commented Jan 7, 2025

The launcher src does not need any of the Java generated headers to compile, yet we are currently adding that directory to the include path. This is usually not a problem, but can cause a race that triggers unwanted recompilation in incremental builds (see bug description for details). This patch fixes this issue by not adding these directories to the include path when building the launcher.


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-8347120: Launchers should not have java headers on include path (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22953

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 7, 2025

👋 Welcome back erikj! 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
Copy link

openjdk bot commented Jan 7, 2025

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

8347120: Launchers should not have java headers on include path

Reviewed-by: dholmes, ihse

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

  • 12752b0: 8347346: Remove redundant ClassForName.java and test.policy from runtime/Dictionary
  • 57af52c: 8346581: JRadioButton/ButtonGroupFocusTest.java fails in CI on Linux
  • 1f45797: 8347124: Clean tests with --enable-linkable-runtime
  • 5e92a4c: 8347267: [macOS]: UnixOperatingSystem.c:67:40: runtime error: division by zero
  • 55c6904: 8331717: C2: Crash with SIGFPE Because Loop Predication Wrongly Hoists Division Requiring Zero Check
  • 1a0fe49: 8347256: Epsilon: Demote heap size and AlwaysPreTouch warnings to info level
  • 8b07617: 8347345: Remove redundant test policy file from ModelMBeanInfoSupport directory
  • f6492aa: 8347279: Problemlist TestEvilSyncBug.java#generational
  • 0210a63: 8347379: Problem list failed tests after JDK-8321413
  • a9351df: 8346787: Fix two C2 IR matching tests for RISC-V
  • ... and 60 more: https://git.openjdk.org/jdk/compare/8b22517cb0b24c4134a2dbf22591f6f84d7d866c...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 changed the title JDK-8347120 8347120: Launchers should not have java headers on include path Jan 7, 2025
@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 7, 2025
@openjdk
Copy link

openjdk bot commented Jan 7, 2025

@erikj79 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 Jan 7, 2025
@mlbridge
Copy link

mlbridge bot commented Jan 7, 2025

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Based on your analysis this seems quite reasonable.

Thanks

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 8, 2025
Copy link
Member

@magicus magicus left a comment

Choose a reason for hiding this comment

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

Seems like a reasonable fix.

@erikj79
Copy link
Member Author

erikj79 commented Jan 10, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Jan 10, 2025

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

  • ec7393e: 8347287: JFR: Remove use of Security Manager
  • 12752b0: 8347346: Remove redundant ClassForName.java and test.policy from runtime/Dictionary
  • 57af52c: 8346581: JRadioButton/ButtonGroupFocusTest.java fails in CI on Linux
  • 1f45797: 8347124: Clean tests with --enable-linkable-runtime
  • 5e92a4c: 8347267: [macOS]: UnixOperatingSystem.c:67:40: runtime error: division by zero
  • 55c6904: 8331717: C2: Crash with SIGFPE Because Loop Predication Wrongly Hoists Division Requiring Zero Check
  • 1a0fe49: 8347256: Epsilon: Demote heap size and AlwaysPreTouch warnings to info level
  • 8b07617: 8347345: Remove redundant test policy file from ModelMBeanInfoSupport directory
  • f6492aa: 8347279: Problemlist TestEvilSyncBug.java#generational
  • 0210a63: 8347379: Problem list failed tests after JDK-8321413
  • ... and 61 more: https://git.openjdk.org/jdk/compare/8b22517cb0b24c4134a2dbf22591f6f84d7d866c...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 10, 2025

@erikj79 Pushed as commit c5c4efd.

💡 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
build build-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants