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

8321539: Minimal build is broken by JDK-8320935 #17020

Conversation

iklam
Copy link
Member

@iklam iklam commented Dec 7, 2023

Please review this trivial fix. CDSConfig::check_vm_args_consistency() should trivially return true on platforms that don't support CDS


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-8321539: Minimal build is broken by JDK-8320935 (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17020

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 7, 2023

👋 Welcome back iklam! 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.

@JohnTortugo
Copy link
Contributor

LGTM

@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 7, 2023
@openjdk
Copy link

openjdk bot commented Dec 7, 2023

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

  • hotspot-runtime

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 hotspot-runtime hotspot-runtime-dev@openjdk.org label Dec 7, 2023
@mlbridge
Copy link

mlbridge bot commented Dec 7, 2023

Webrevs

Copy link
Contributor

@matias9927 matias9927 left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Member

@calvinccheung calvinccheung left a comment

Choose a reason for hiding this comment

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

Looks good.

@openjdk
Copy link

openjdk bot commented Dec 7, 2023

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

8321539: Minimal build is broken by JDK-8320935

Reviewed-by: matsaave, ccheung, mbaesken

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

  • 86623aa: 8320786: Remove ThreadGroup.stop
  • af5c492: 8320532: Remove Thread/ThreadGroup suspend/resume
  • cb7e3d2: 8321560: [BACKOUT] 8299426: Heap dump does not contain virtual Thread stack references
  • 25dc476: 8286827: BogusColorSpace methods return wrong array
  • 11e4a92: 8320597: RSA signature verification fails on signed data that does not encode params correctly
  • 354ea4c: 8299426: Heap dump does not contain virtual Thread stack references
  • 959a443: 8288712: Typo in javadoc in javax.imageio.ImageReader.java
  • 4ed38f5: 8321409: Console read line with zero out should zero out underlying buffer in JLine (redux)
  • fe4c0a2: 8302790: Set FileMapRegion::mapped_base() to null if mapping fails
  • 519ecd3: 8319413: Start of release updates for JDK 23
  • ... and 17 more: https://git.openjdk.org/jdk/compare/632a3c56e0626b4c4f79c8cb3d2ae312668d63fc...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 Dec 7, 2023
Copy link
Member

@MBaesken MBaesken left a comment

Choose a reason for hiding this comment

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

Thanks for the fix. This fixes also the AIX build (the AIX build was broken after JDK-8320935) .
I still have a question - why is the cds related coding in arguments.cpp (e.g. CDSConfig::check_system_property(key, value) );
not guarded by
#if INCLUDE_CDS ?

@iklam
Copy link
Member Author

iklam commented Dec 8, 2023

Thanks for the fix. This fixes also the AIX build (the AIX build was broken after JDK-8320935) . I still have a question - why is the cds related coding in arguments.cpp (e.g. CDSConfig::check_system_property(key, value) ); not guarded by #if INCLUDE_CDS ?

We usually use the NOT_CDS_XXX macros in the header files to provide dummy implementations when CDS is not enabled. This avoids the proliferation of #if INCLUDE_CDS in the source code.

@iklam
Copy link
Member Author

iklam commented Dec 8, 2023

Thanks @MBaesken @matias9927 @calvinccheung for the review.
/integrate

@openjdk
Copy link

openjdk bot commented Dec 8, 2023

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

  • 2c2d4d2: 8321485: remove serviceability/attach/ConcAttachTest.java from problemlist on macosx
  • 0eb299a: 8316141: Improve CEN header validation checking
  • b893a2b: 8321597: Use .template consistently for files treated as templates by the build
  • 05f9509: 8321374: Add a configure option to explicitly set CompanyName property in VersionInfo resource for Windows exe/dll
  • 701bc3b: 8295166: IGV: dump graph at more locations
  • 9e48b90: 8310524: C2: record parser-generated LoadN nodes for IGVN
  • bad5edf: 8320959: jdk/jfr/event/runtime/TestShutdownEvent.java crash with CONF=fastdebug -Xcomp
  • f577385: 8316738: java/net/httpclient/HttpClientLocalAddrTest.java failed in timeout
  • 86623aa: 8320786: Remove ThreadGroup.stop
  • af5c492: 8320532: Remove Thread/ThreadGroup suspend/resume
  • ... and 25 more: https://git.openjdk.org/jdk/compare/632a3c56e0626b4c4f79c8cb3d2ae312668d63fc...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 8, 2023

@iklam Pushed as commit 5e6bfc5.

💡 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
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
5 participants