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

8297088: Update LCMS to 2.14 #11217

Closed
wants to merge 2 commits into from

Conversation

alisenchung
Copy link
Contributor

@alisenchung alisenchung commented Nov 17, 2022

Redo of 8295369: Update LCMS to 2.14
Update LCMS to newest release.
Updated DISABLED_WARNINGS_gcc for LCMS to include type limits to prevent a build error in linux.
Automatic tests and J2D demo tests were run.


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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11217

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 17, 2022

👋 Welcome back achung! 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 Nov 17, 2022
@openjdk
Copy link

openjdk bot commented Nov 17, 2022

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

  • build
  • client

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 client client-libs-dev@openjdk.org labels Nov 17, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 17, 2022

Webrevs

Copy link
Member

@erikj79 erikj79 left a comment

Choose a reason for hiding this comment

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

Build change looks good.

@openjdk
Copy link

openjdk bot commented Nov 17, 2022

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

8297088: Update LCMS to 2.14

Reviewed-by: erikj, serb, prr, honkar

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

  • c4b6920: 8296910: Add EdDSA/XDH/RSASSA-PSS to KeyPairGeneratorBench.java
  • f34ca80: 8297245: JFR: TestRemoteDump should use RemoteRecordingStream
  • 13158cb: 8293041: --disable-@files option doesn't work and cause an error
  • 761a4f4: 8295788: C2 compilation hits "assert((mode == ControlAroundStripMined && use == sfpt) || !use->is_reachable_from_root()) failed: missed a node"
  • 2f2d404: 8297129: Inflater documentation refers to 'deflate' methods
  • dd18d76: 8297173: usageTicks and totalTicks should be volatile to ensure that different threads get the latest ticks
  • 2b6dbc7: 8293856: AArch64: Remove clear_inst_mark from aarch64_enc_java_dynamic_call
  • 2f063b8: 8296846: Minor cleanup of some dead code in Flow.java
  • ab6b7ef: 8296901: Do not create unsigned certificate and CRL
  • 7b3984c: 8296463: Memory leak in JVM_StartThread with the integration of Virtual threads
  • ... and 32 more: https://git.openjdk.org/jdk/compare/95c390ec75eec31cdf613c8bb236e43aa65a1bb5...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 Nov 17, 2022
@@ -305,7 +305,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \
common/awt/debug \
libawt/java2d, \
HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \
DISABLED_WARNINGS_gcc := format-nonliteral stringop-truncation, \
DISABLED_WARNINGS_gcc := format-nonliteral type-limits stringop-truncation, \
Copy link
Member

Choose a reason for hiding this comment

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

it would be good to report this upstream.

@honkar-jdk
Copy link
Contributor

File headers update, indentation & spacing looks good.

@alisenchung
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 18, 2022

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

  • 9b4e0e8: 8297080: Remove com/sun/jdi/NashornPopFrameTest.java from the problem list
  • 3272954: 8297083: Remove vmTestbase/nsk/jvmti/GetAllThreads/allthr001 from problem list
  • c4b6920: 8296910: Add EdDSA/XDH/RSASSA-PSS to KeyPairGeneratorBench.java
  • f34ca80: 8297245: JFR: TestRemoteDump should use RemoteRecordingStream
  • 13158cb: 8293041: --disable-@files option doesn't work and cause an error
  • 761a4f4: 8295788: C2 compilation hits "assert((mode == ControlAroundStripMined && use == sfpt) || !use->is_reachable_from_root()) failed: missed a node"
  • 2f2d404: 8297129: Inflater documentation refers to 'deflate' methods
  • dd18d76: 8297173: usageTicks and totalTicks should be volatile to ensure that different threads get the latest ticks
  • 2b6dbc7: 8293856: AArch64: Remove clear_inst_mark from aarch64_enc_java_dynamic_call
  • 2f063b8: 8296846: Minor cleanup of some dead code in Flow.java
  • ... and 34 more: https://git.openjdk.org/jdk/compare/95c390ec75eec31cdf613c8bb236e43aa65a1bb5...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 18, 2022

@alisenchung Pushed as commit 2c692aa.

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