Skip to content

Conversation

@magicus
Copy link
Member

@magicus magicus commented Feb 6, 2025

Re-do of JDK-8348190 Framework for tracing makefile inclusion and parsing.

This should be essentially identical to JDK-8348190; the fixes were in closed Oracle source. My apologizes for all this mess, and that it spilled out in the open JDK instead of being resolved just internally at Oracle. 😿


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-8349515: [REDO] Framework for tracing makefile inclusion and parsing (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23494

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 6, 2025

👋 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
Copy link

openjdk bot commented Feb 6, 2025

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

8349515: [REDO] Framework for tracing makefile inclusion and parsing

Reviewed-by: erikj

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

  • df654a9: 8349752: Tier1 build failure caused by JDK-8349178
  • 527489c: 8349284: Make libExplicitAttach work on static JDK
  • f11a737: 8349475: Test tools/javac/api/TestJavacTaskWithWarning.java writes files in src dir
  • b737f7f: 8349501: Relocate supporting classes in security/testlibrary to test/lib/jdk tree
  • 84b32cb: 8349178: runtime/jni/atExit/TestAtExit.java should be supported on static JDK
  • ab66c82: 8349639: jfr/event/gc/detailed/TestShenandoahEvacuationInformationEvent.java fails to compile after JDK-8348610
  • f74c4df: 8349580: Do not use address in MemTracker top level functions
  • c9cadbd: 8346567: Make Class.getModifiers() non-native
  • 5589892: 8343074: test/jdk/com/sun/net/httpserver/docs/test1/largefile.txt could be generated
  • d104deb: 8349556: RISC-V: improve the performance when -COH and -AvoidUnalignedAccesses for UL and LU string comparison
  • ... and 30 more: https://git.openjdk.org/jdk/compare/dd8720e90dc5475afd4ccc7321bb5cd97282e101...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
Copy link

openjdk bot commented Feb 6, 2025

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

  • build
  • client
  • compiler
  • core-libs
  • hotspot-jfr
  • i18n
  • ide-support
  • kulla
  • net
  • serviceability

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added serviceability serviceability-dev@openjdk.org build build-dev@openjdk.org ide-support ide-support-dev@openjdk.org client client-libs-dev@openjdk.org core-libs core-libs-dev@openjdk.org net net-dev@openjdk.org compiler compiler-dev@openjdk.org kulla kulla-dev@openjdk.org i18n i18n-dev@openjdk.org hotspot-jfr hotspot-jfr-dev@openjdk.org labels Feb 6, 2025
@magicus
Copy link
Member Author

magicus commented Feb 7, 2025

/label -client -compiler -core-libs -hotspot-jfr -i18n -ide-support -kulla -net -serviceability

@openjdk openjdk bot removed client client-libs-dev@openjdk.org compiler compiler-dev@openjdk.org core-libs core-libs-dev@openjdk.org hotspot-jfr hotspot-jfr-dev@openjdk.org i18n i18n-dev@openjdk.org ide-support ide-support-dev@openjdk.org kulla kulla-dev@openjdk.org net net-dev@openjdk.org serviceability serviceability-dev@openjdk.org labels Feb 7, 2025
@openjdk
Copy link

openjdk bot commented Feb 7, 2025

@magicus
The client label was successfully removed.

The compiler label was successfully removed.

The core-libs label was successfully removed.

The hotspot-jfr label was successfully removed.

The i18n label was successfully removed.

The ide-support label was successfully removed.

The kulla label was successfully removed.

The net label was successfully removed.

The serviceability label was successfully removed.

@magicus magicus marked this pull request as ready for review February 10, 2025 16:18
@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 10, 2025
@mlbridge
Copy link

mlbridge bot commented Feb 10, 2025

Webrevs

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Feb 10, 2025
@magicus
Copy link
Member Author

magicus commented Feb 11, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Feb 11, 2025

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

  • 8e85829: 8349213: G1: Clearing bitmaps during collection set merging not claimed by region
  • 1a8212e: 8348678: [PPC64] C2: unaligned vector load/store is ok
  • 41bdc47: 8208377: Soft hyphens render if not using TextLayout
  • df654a9: 8349752: Tier1 build failure caused by JDK-8349178
  • 527489c: 8349284: Make libExplicitAttach work on static JDK
  • f11a737: 8349475: Test tools/javac/api/TestJavacTaskWithWarning.java writes files in src dir
  • b737f7f: 8349501: Relocate supporting classes in security/testlibrary to test/lib/jdk tree
  • 84b32cb: 8349178: runtime/jni/atExit/TestAtExit.java should be supported on static JDK
  • ab66c82: 8349639: jfr/event/gc/detailed/TestShenandoahEvacuationInformationEvent.java fails to compile after JDK-8348610
  • f74c4df: 8349580: Do not use address in MemTracker top level functions
  • ... and 33 more: https://git.openjdk.org/jdk/compare/dd8720e90dc5475afd4ccc7321bb5cd97282e101...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 11, 2025

@magicus Pushed as commit 964dd18.

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

@magicus magicus deleted the makefile-flow-redo branch February 11, 2025 10:56
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.

2 participants