archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Jesper Wilhelmsson 2021-01-07 23:51:21 +00:00
commit 56a354eb55
15 changed files with 167 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

78
test/hotspot/jtreg/compiler/loopopts/TestDivZeroDominatedBy.java Normal file
View file

@ -0,0 +1,78 @@
/*
* Copyright (c) 2021, 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
* @key stress randomness
* @bug 8259227
* @summary Verify that zero check is executed before division/modulo operation.
* @requires vm.compiler2.enabled
* @run main/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=compiler/loopopts/TestDivZeroDominatedBy::test
* -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM -XX:StressSeed=917280111 compiler.loopopts.TestDivZeroDominatedBy
* @run main/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=compiler/loopopts/TestDivZeroDominatedBy::test
* -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM compiler.loopopts.TestDivZeroDominatedBy
*/
package compiler.loopopts;
public class TestDivZeroDominatedBy {
public static int iFld = 1;
public static int iFld1 = 2;
public static int iFld2 = 3;
public static int iArrFld[] = new int[10];
public static double dFld = 1.0;
public static void test() {
int x = 1;
int y = 2;
int z = 3;
iFld = y;
iArrFld[5] += iFld1;
int i = 1;
do {
for (int j = 0; j < 10; j++) {
iFld2 += iFld2;
iFld1 = iFld2;
int k = 1;
do {
iArrFld[k] = y;
z = iFld2;
dFld = x;
try {
y = iArrFld[k];
iArrFld[8] = 5;
iFld = (100 / z);
} catch (ArithmeticException a_e) {}
} while (++k < 2);
}
} while (++i < 10);
}
public static void main(String[] strArr) {
test();
}
}

5
test/hotspot/jtreg/compiler/loopopts/TestDivZeroWithSplitIf.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 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
@ -24,11 +24,14 @@
/*
* @test
* @key stress randomness
* @bug 8257822
* @summary Verify that zero check is executed before division/modulo operation.
* @requires vm.compiler2.enabled
* @run main/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=compiler/loopopts/TestDivZeroWithSplitIf::test
* -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM -XX:StressSeed=873732072 compiler.loopopts.TestDivZeroWithSplitIf
* @run main/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=compiler/loopopts/TestDivZeroWithSplitIf::test
* -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM compiler.loopopts.TestDivZeroWithSplitIf
*/
package compiler.loopopts;

21
test/jdk/jdk/jfr/javaagent/EventEmitterAgent.java
View file

@ -35,12 +35,10 @@ import jdk.jfr.consumer.RecordingFile;
import jdk.test.lib.Asserts;
import jdk.test.lib.jfr.EventNames;
// Java agent that emits in multiple threads
// Java agent that emits events
public class EventEmitterAgent {
private static final int THREADS = 5;
private static final int EVENTS_PER_THREAD = 150_000;
private static final int EXPECTED_COUNT = THREADS * EVENTS_PER_THREAD;
private static final long EVENTS = 150_000;
private static final Path DUMP_PATH = Paths.get("dump.jfr").toAbsolutePath();
// Called when agent is loaded from command line
@ -58,20 +56,13 @@ public class EventEmitterAgent {
r.enable(EventNames.JavaExceptionThrow);
r.setDestination(DUMP_PATH);
r.start();
Thread[] threads = new Thread[THREADS];
for (int i = 0; i < THREADS; i++) {
threads[i] = new Thread(EventEmitterAgent::emitEvents);
threads[i].start();
}
for (int i = 0; i < THREADS; i++) {
threads[i].join();
}
emitEvents();
r.stop();
}
}
public static void emitEvents() {
for (int i = 0; i < EVENTS_PER_THREAD; i++) {
for (int i = 0; i < EVENTS; i++) {
TestEvent e = new TestEvent();
e.msg = "Long message that puts pressure on the string pool " + i % 100;
e.count = i;
@ -80,7 +71,7 @@ public class EventEmitterAgent {
e.commit();
if (i % 10000 == 0) {
try {
Thread.sleep(1);
Thread.sleep(10);
} catch (InterruptedException ie) {
// ignore
}
@ -101,6 +92,6 @@ public class EventEmitterAgent {
.stream()
.filter(e -> e.getEventType().getName().equals("Test"))
.count();
Asserts.assertTrue(testEventCount == EXPECTED_COUNT, "Mismatch in TestEvent count");
Asserts.assertEquals(testEventCount, EVENTS, "Mismatch in TestEvent count");
}
}

11
test/langtools/tools/javac/sealed/SealedCompilationTests.java
View file

@ -1247,6 +1247,17 @@ public class SealedCompilationTests extends CompilationTestCase {
a = (A)c;
}
}
""",
"""
sealed interface A<T> {
final class B implements A<Object> { }
}
class Test {
void f(A.B a, A<Object> b) {
a = (A.B)b;
}
}
"""
)) {
assertOK(s);