This repository has been archived by the owner on Sep 19, 2023. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8290705: StringConcat::validate_mem_flow asserts with "unexpected use…
…r: StoreI" Backport-of: 61e072d
- Loading branch information
1 parent
6b9fe5d
commit 63c53da
Showing
3 changed files
with
122 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
test/hotspot/jtreg/compiler/stringopts/SideEffectBeforeConstructor.jasm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
/* | ||
* Copyright (c) 2022, 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. | ||
*/ | ||
|
||
super public class compiler/stringopts/SideEffectBeforeConstructor | ||
version 51:0 | ||
{ | ||
public static Field result:I; | ||
|
||
static Method "<clinit>":"()V" | ||
stack 2 locals 0 | ||
{ | ||
iconst_0; | ||
putstatic Field result:"I"; | ||
return; | ||
} | ||
public Method "<init>":"()V" | ||
stack 1 locals 1 | ||
{ | ||
aload_0; | ||
invokespecial Method java/lang/Object."<init>":"()V"; | ||
return; | ||
} | ||
|
||
public static Method test:"(Ljava/lang/String;)V" | ||
stack 4 locals 1 | ||
{ | ||
new class java/lang/StringBuffer; | ||
dup; | ||
getstatic Field result:"I"; | ||
iconst_1; | ||
iadd; | ||
putstatic Field result:"I"; | ||
aload_0; | ||
invokespecial Method java/lang/StringBuffer."<init>":"(Ljava/lang/String;)V"; | ||
invokevirtual Method java/lang/StringBuffer.toString:"()Ljava/lang/String;"; | ||
return; | ||
} | ||
} |
49 changes: 49 additions & 0 deletions
49
test/hotspot/jtreg/compiler/stringopts/TestSideEffectBeforeConstructor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/* | ||
* Copyright (c) 2022, 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 8290705 | ||
* @summary Test correctness of the string concatenation optimization with | ||
* a store between StringBuffer allocation and constructor invocation. | ||
* @compile SideEffectBeforeConstructor.jasm | ||
* @run main/othervm -Xbatch compiler.stringopts.TestSideEffectBeforeConstructor | ||
*/ | ||
|
||
package compiler.stringopts; | ||
|
||
public class TestSideEffectBeforeConstructor { | ||
|
||
public static void main(String[] args) { | ||
for (int i = 0; i < 100_000; ++i) { | ||
try { | ||
SideEffectBeforeConstructor.test(null); | ||
} catch (NullPointerException npe) { | ||
// Expected | ||
} | ||
} | ||
if (SideEffectBeforeConstructor.result != 100_000) { | ||
throw new RuntimeException("Unexpected result: " + SideEffectBeforeConstructor.result); | ||
} | ||
} | ||
} |
63c53da
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues