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

8274265: Suspicious string concatenation in logTestUtils.inline.hpp #5675

Conversation

jespersm
Copy link

@jespersm jespersm commented Sep 24, 2021

This patch fixes the mishap, and lets JDK compile under XCode 13 / LLVM 13.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8274265: Suspicious string concatenation in logTestUtils.inline.hpp

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5675/head:pull/5675
$ git checkout pull/5675

Update a local copy of the PR:
$ git checkout pull/5675
$ git pull https://git.openjdk.java.net/jdk pull/5675/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5675

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5675.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 24, 2021

👋 Welcome back jespersm! 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 label Sep 24, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 24, 2021

@jespersm 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 label Sep 24, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 24, 2021

Webrevs

Copy link
Member

@MBaesken MBaesken left a comment

Looks good to me !
Thanks, Matthias

@openjdk
Copy link

@openjdk openjdk bot commented Sep 27, 2021

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

8274265: Suspicious string concatenation in logTestUtils.inline.hpp

Reviewed-by: clanger, 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 49 new commits pushed to the master branch:

  • 6f4cefb: 8274394: Use Optional.isEmpty instead of !Optional.isPresent in jdk.jlink
  • 94f5e80: 8274276: Cache normalizedBase URL in URLClassPath.FileLoader
  • b36881f: 8274383: JNI call of getAccessibleSelection on a wrong thread
  • be40373: 8274381: missing CAccessibility definitions in JNI code
  • 79865cd: 8274259: G1: assert(check_alignment(result)) failed: address not aligned: 0x00000008baadbabe after JDK-8270009
  • 961dcff: 8273581: Change the mechanism by which JDK loads the platform-specific FontManager class
  • 6a573b8: 8273508: Support archived heap objects in SerialGC
  • 3eca9c3: 8264707: HotSpot Style Guide should permit use of lambda
  • af50772: 8231640: (prop) Canonical property storage
  • ddc2627: 8273790: Potential cyclic dependencies between Gregorian and CalendarSystem
  • ... and 39 more: https://git.openjdk.java.net/jdk/compare/bb74ae87abee0fb550e4138242919ec791f7791c...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@RealCLanger, @MBaesken) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready label Sep 27, 2021
@iklam
Copy link
Member

@iklam iklam commented Sep 28, 2021

I've updated the RFE title to be more specific. Please update the PR title to match the RFE before integration.

@jespersm jespersm changed the title 8274265: Suspicious string concatenation in test code 8274265: Suspicious string concatenation in logTestUtils.inline.hpp Sep 28, 2021
@jespersm
Copy link
Author

@jespersm jespersm commented Sep 28, 2021

/integrate

@openjdk openjdk bot added the sponsor label Sep 28, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 28, 2021

@jespersm
Your change (at version b8af647) is now ready to be sponsored by a Committer.

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Sep 28, 2021

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Sep 28, 2021

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

  • 6f4cefb: 8274394: Use Optional.isEmpty instead of !Optional.isPresent in jdk.jlink
  • 94f5e80: 8274276: Cache normalizedBase URL in URLClassPath.FileLoader
  • b36881f: 8274383: JNI call of getAccessibleSelection on a wrong thread
  • be40373: 8274381: missing CAccessibility definitions in JNI code
  • 79865cd: 8274259: G1: assert(check_alignment(result)) failed: address not aligned: 0x00000008baadbabe after JDK-8270009
  • 961dcff: 8273581: Change the mechanism by which JDK loads the platform-specific FontManager class
  • 6a573b8: 8273508: Support archived heap objects in SerialGC
  • 3eca9c3: 8264707: HotSpot Style Guide should permit use of lambda
  • af50772: 8231640: (prop) Canonical property storage
  • ddc2627: 8273790: Potential cyclic dependencies between Gregorian and CalendarSystem
  • ... and 39 more: https://git.openjdk.java.net/jdk/compare/bb74ae87abee0fb550e4138242919ec791f7791c...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 28, 2021
@openjdk openjdk bot added integrated and removed ready rfr sponsor labels Sep 28, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 28, 2021

@RealCLanger @jespersm Pushed as commit c57a6c6.

💡 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 integrated
4 participants