8248816: C1: Fix signature conflict in LIRGenerator::strength_reduce_multiply

[rnkovacs]

Changes apply cleanly.

This is part of the Windows/AArch64 port.

---

Progress

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

Issue

• JDK-8248816: C1: Fix signature conflict in LIRGenerator::strength_reduce_multiply

Contributors

• Bernhard Urban-Forster <[email protected]>

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/269/head:pull/269
$ git checkout pull/269

Update a local copy of the PR:
$ git checkout pull/269
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/269/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 269

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/269.diff

[bridgekeeper]

👋 Welcome back rnkovacs! 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]

This backport pull request has now been updated with issue from the original commit.

[openjdk]

@rnkovacs This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8248816: C1: Fix signature conflict in LIRGenerator::strength_reduce_multiply

Co-authored-by: Bernhard Urban-Forster <[email protected]>

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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.

➡️ 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).

[rnkovacs]

/contributor add Bernhard Urban-Forster [email protected]

[openjdk]

@rnkovacs
Contributor Bernhard Urban-Forster <[email protected]> successfully added.

[mlbridge]

Webrevs

• 00: Full (03e52372)

[rnkovacs]

I don't think the test failure on Windows x64 is caused by this patch - it doesn't touch x64 related code, and the failure is there in #263 too. Didn't come up in my testing.

[rnkovacs]

/integrate

[openjdk]

@rnkovacs
Your change (at version 03e5237) is now ready to be sponsored by a Committer.

[RealCLanger]

Again the test failure in Windows hs tests - but I'm quite conviced it cannot have to do with this one. So,

/sponsor

[openjdk]

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

• 4a3afd7: 8248657: Windows: strengthening in ThreadCritical regarding memory model
• 8afb159: 8250824: AArch64: follow up for JDK-8248414
• 6a6e00e: 8255790: GTKL&F: Java 16 crashes on initialising GTKL&F on Manjaro Linux
• 83d916e: 8272772: Shenandoah: compiler/c2/aarch64/TestVolatilesShenandoah.java fails in 11u
• 417b388: 8272472: StackGuardPages test doesn't build with glibc 2.34
• a27ee49: 8270096: Shenandoah: Optimize gc/shenandoah/TestRefprocSanity.java for interpreter mode
• 4a2cd36: 8252853: AArch64: gc/shenandoah/TestVerifyJCStress.java fails intermittently with C1
• 519894a: 8269478: Shenandoah: gc/shenandoah/mxbeans tests should be more resilient
• 2d6c976: 8225790: Two NestedDialogs tests fail on Ubuntu
• 7b72611: 8213007: Update the link in test/jdk/sun/security/provider/SecureRandom/DrbgCavp.java
• ... and 7 more: https://git.openjdk.java.net/jdk11u-dev/compare/f4772b52b80a5c95a33c5147f36b6686a021bc29...master

Your commit was automatically rebased without conflicts.

[openjdk]

@RealCLanger @rnkovacs Pushed as commit 4699467.

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