Skip to content

Commit

Permalink
8326638: Crash in PhaseIdealLoop::remix_address_expressions due to un…
Browse files Browse the repository at this point in the history 
…expected Region instead of Loop

Reviewed-by: chagedorn, kvn
  • Loading branch information
@TobiHartmann
TobiHartmann committed Feb 27, 2024
1 parent 81b065a commit 9f0e7da
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/hotspot/share/opto/loopopts.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -571,8 +571,8 @@ Node* PhaseIdealLoop::remix_address_expressions(Node* n) {
}

// Replace ((I1 +p V) +p I2) with ((I1 +p I2) +p V),
// but not if I2 is a constant.
if (n_op == Op_AddP) {
// but not if I2 is a constant. Skip for irreducible loops.
if (n_op == Op_AddP && n_loop->_head->is_Loop()) {
if (n2_loop == n_loop && n3_loop != n_loop) {
if (n->in(2)->Opcode() == Op_AddP && !n->in(3)->is_Con()) {
Node* n22_ctrl = get_ctrl(n->in(2)->in(2));
Expand Down
57 changes: 57 additions & 0 deletions test/hotspot/jtreg/compiler/loopopts/TestRemixAddressExpressionsWithIrreducibleLoop.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/*
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*
*/

/*
* @test
* @bug 8326638
* @summary Test handling of irreducible loops in PhaseIdealLoop::remix_address_expressions.
* @run main/othervm -XX:-TieredCompilation -Xbatch
* -XX:CompileCommand=compileonly,TestRemixAddressExpressionsWithIrreducibleLoop::test
* TestRemixAddressExpressionsWithIrreducibleLoop
*/

public class TestRemixAddressExpressionsWithIrreducibleLoop {

public static void main(String[] args) {
test("4");
}

public static void test(String arg) {
for (int i = 0; i < 100_000; ++i) {
int j = 0;
while (true) {
boolean tmp = "1\ufff0".startsWith(arg, 2 - arg.length());
if (j++ > 100)
break;
}
loop:
while (i >= 100) {
for (int i2 = 0; i2 < 1; i2 = 1)
if (j > 300)
break loop;
j++;
}
}
}
}

7 comments on commit 9f0e7da

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@luchenlin
Copy link

Choose a reason for hiding this comment

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

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 9f0e7da Mar 4, 2024

Choose a reason for hiding this comment

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

@luchenlin the backport was successfully created on the branch backport-luchenlin-9f0e7da6 in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 9f0e7da6 from the openjdk/jdk repository.

The commit being backported was authored by Tobias Hartmann on 27 Feb 2024 and was reviewed by Christian Hagedorn and Vladimir Kozlov.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-luchenlin-9f0e7da6:backport-luchenlin-9f0e7da6
$ git checkout backport-luchenlin-9f0e7da6
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-luchenlin-9f0e7da6

@luchenlin
Copy link

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 9f0e7da Mar 4, 2024

Choose a reason for hiding this comment

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

@luchenlin Could not automatically backport 9f0e7da6 to openjdk/jdk17u-dev due to conflicts in the following files:

  • src/hotspot/share/opto/loopopts.cpp

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-luchenlin-9f0e7da6

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 9f0e7da64e21237322e55ca4f0e3639fa5d1c4ed

# Backport the commit
$ git cherry-pick --no-commit 9f0e7da64e21237322e55ca4f0e3639fa5d1c4ed
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 9f0e7da64e21237322e55ca4f0e3639fa5d1c4ed'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport 9f0e7da64e21237322e55ca4f0e3639fa5d1c4ed.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 9f0e7da6 from the openjdk/jdk repository.

The commit being backported was authored by Tobias Hartmann on 27 Feb 2024 and was reviewed by Christian Hagedorn and Vladimir Kozlov.

Thanks!

@luchenlin
Copy link

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 9f0e7da Mar 4, 2024

Choose a reason for hiding this comment

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

@luchenlin Could not automatically backport 9f0e7da6 to openjdk/jdk11u-dev due to conflicts in the following files:

  • src/hotspot/share/opto/loopopts.cpp

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk11u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-luchenlin-9f0e7da6

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 9f0e7da64e21237322e55ca4f0e3639fa5d1c4ed

# Backport the commit
$ git cherry-pick --no-commit 9f0e7da64e21237322e55ca4f0e3639fa5d1c4ed
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 9f0e7da64e21237322e55ca4f0e3639fa5d1c4ed'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 9f0e7da64e21237322e55ca4f0e3639fa5d1c4ed.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 9f0e7da6 from the openjdk/jdk repository.

The commit being backported was authored by Tobias Hartmann on 27 Feb 2024 and was reviewed by Christian Hagedorn and Vladimir Kozlov.

Thanks!

Please sign in to comment.