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

8328824: Clean up java.base native compilation #18457

Closed
wants to merge 4 commits into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Mar 22, 2024

This is a follow-up on JDK-8328680, making the same kind of cleanup to java.base. Some code needed more special treatment here, so there is some additional effects outside of the modules/java.base directory.


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-8328824: Clean up java.base native compilation (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18457

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 22, 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.

@@ -266,6 +266,19 @@ define SetupJdkExecutableBody
$1_LIBS += $(LIBCXX)
endif

ifeq ($$($1_SRC), )
Copy link
Member Author

Choose a reason for hiding this comment

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

General note: There amount of duplication between SetupJdkLibrary and SetupJdkExecutable is quickly becoming staggering... When I'm done with this cleanup, I'll unify them.

@openjdk
Copy link

openjdk bot commented Mar 22, 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:

8328824: Clean up java.base native compilation

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

  • af15c68: 8321278: C2: Partial peeling fails with assert "last_peel <- first_not_peeled"
  • 142c311: 8328744: Parallel: Parallel GC throws OOM before heap is fully expanded
  • cb2a671: 8324121: SIGFPE in PhaseIdealLoop::extract_long_range_checks
  • 0c1b254: 8326438: C2: assert(ld->in(1)->Opcode() == Op_LoadN) failed: Assumption invalid: input to DecodeN is not LoadN
  • 29ba4b7: 8328705: GHA: Cross-compilation jobs do not require build JDK
  • f67ec19: 8079786: [macosx] Test java/awt/Frame/DisposeParentGC/DisposeParentGC.java fails for Mac only
  • 93579c2: 8323552: AbstractMemorySegmentImpl#mismatch returns -1 when comparing distinct areas of the same instance of MemorySegment
  • b235682: 8328709: AIX os::get_summary_cpu_info support Power 10
  • 19a0151: 8328700: Unused import and variable should be deleted in regex package
  • cf9b5a7: 8328776: [AIX] remove checked_vmgetinfo, use vmgetinfo directly
  • ... and 16 more: https://git.openjdk.org/jdk/compare/f207aa94f9296932276c2952252b263efc793b3f...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 Mar 22, 2024

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

  • build
  • core-libs

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 build build-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Mar 22, 2024
@magicus
Copy link
Member Author

magicus commented Mar 22, 2024

/label -core-libs

@openjdk openjdk bot removed the core-libs core-libs-dev@openjdk.org label Mar 22, 2024
@openjdk
Copy link

openjdk bot commented Mar 22, 2024

@magicus
The core-libs label was successfully removed.

@magicus magicus marked this pull request as ready for review March 23, 2024 00:13
@magicus
Copy link
Member Author

magicus commented Mar 23, 2024

I can confirm that COMPARE_BUILD only sees changed files in java.base. Once again, as far as I can tell, the changes are all related to the reordering of libraries to link with.

@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 23, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 23, 2024

Webrevs

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 25, 2024
@magicus
Copy link
Member Author

magicus commented Mar 25, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Mar 25, 2024

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

  • af15c68: 8321278: C2: Partial peeling fails with assert "last_peel <- first_not_peeled"
  • 142c311: 8328744: Parallel: Parallel GC throws OOM before heap is fully expanded
  • cb2a671: 8324121: SIGFPE in PhaseIdealLoop::extract_long_range_checks
  • 0c1b254: 8326438: C2: assert(ld->in(1)->Opcode() == Op_LoadN) failed: Assumption invalid: input to DecodeN is not LoadN
  • 29ba4b7: 8328705: GHA: Cross-compilation jobs do not require build JDK
  • f67ec19: 8079786: [macosx] Test java/awt/Frame/DisposeParentGC/DisposeParentGC.java fails for Mac only
  • 93579c2: 8323552: AbstractMemorySegmentImpl#mismatch returns -1 when comparing distinct areas of the same instance of MemorySegment
  • b235682: 8328709: AIX os::get_summary_cpu_info support Power 10
  • 19a0151: 8328700: Unused import and variable should be deleted in regex package
  • cf9b5a7: 8328776: [AIX] remove checked_vmgetinfo, use vmgetinfo directly
  • ... and 16 more: https://git.openjdk.org/jdk/compare/f207aa94f9296932276c2952252b263efc793b3f...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 25, 2024

@magicus Pushed as commit 26b2ec4.

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

@magicus magicus deleted the build-cleanup-java.base branch March 25, 2024 15:18
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