jdk-sandbox: comparison test/hotspot/jtreg/compiler/c2/Test8004741.java

equal deleted inserted replaced

-:a129f10e1b9a
+:8e7f29b1ad4a
 /*
-* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2012, 2019, 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.
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
 /*
-* @test Test8004741.java
+* @test
 * @bug 8004741
 * @summary Missing compiled exception handle table entry for multidimensional array allocation
 *
 * @requires !vm.graal.enabled
+* @library /test/lib
+*
+* @build sun.hotspot.WhiteBox
+* @run driver ClassFileInstaller sun.hotspot.WhiteBox
+*                                sun.hotspot.WhiteBox$WhiteBoxPermission
+*
 * @run main/othervm -Xmx128m -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
 *    -XX:-TieredCompilation -XX:+StressCompiledExceptionHandlers
 *    -XX:+SafepointALot -XX:GuaranteedSafepointInterval=100
+*    -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
 *    compiler.c2.Test8004741
+*
 * @run main/othervm -Xmx128m -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
 *    -XX:-TieredCompilation -XX:+StressCompiledExceptionHandlers
+*    -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
 *    compiler.c2.Test8004741
 */
 package compiler.c2;
+import sun.hotspot.WhiteBox;
 public class Test8004741 extends Thread {
 static int passed = 0;
 try {
 ar = new int[a][b];
 } catch (ThreadDeath e) {
 System.out.println("test got ThreadDeath");
 passed++;
-throw(e);
+throw e;
 }
 return ar;
 }
 /* Cookbook wait-notify to track progress of test thread. */
 synchronized (progressLock) {
 while (progressState < state) {
 try {
 progressLock.wait();
 } catch (InterruptedException e) {
-e.printStackTrace();
+throw new Error("unexpected InterruptedException", e);
-System.out.println("unexpected InterruptedException");
-fail();
 }
 }
 if (progressState > state) {
-System.out.println("unexpected test state change, expected " +
+throw new Error("unexpected test state change, state = " + state + ", progressState = " + progressState);
-state + " but saw " + progressState);
-fail();
 }
 }
 }
 /**
 test(2, 100);
 }
 } catch (ThreadDeath e) {
 // nothing to say, passing was incremented by the test.
 } catch (Throwable e) {
-e.printStackTrace();
+throw new Error("unexpected Throwable " + e, e);
-System.out.println("unexpected Throwable " + e);
-fail();
 }
 toState(STOPPING);
 }
 /**
 // t will never be started.
 for (int n = 0; n < 11000; n++) {
 test(2, 100);
 }
-// Will this sleep help ensure that the compiler is run?
+var method = Test8004741.class.getDeclaredMethod("test", int.class, int.class);
-Thread.sleep(500);
+if (!WhiteBox.getWhiteBox().isMethodCompiled(method)) {
-passed = 0;
+throw new Error("test method didn't get compiled");
+}
 try {
 test(-1, 100);
-System.out.println("Missing NegativeArraySizeException #1");
+throw new AssertionError("Missing NegativeArraySizeException");
-fail();
+} catch (NegativeArraySizeException e) {
-} catch ( java.lang.NegativeArraySizeException e ) {
 System.out.println("Saw expected NegativeArraySizeException #1");
 }
 try {
 test(100, -1);
-fail();
+throw new AssertionError("Missing NegativeArraySizeException");
-System.out.println("Missing NegativeArraySizeException #2");
+} catch (NegativeArraySizeException e) {
-fail();
-} catch ( java.lang.NegativeArraySizeException e ) {
 System.out.println("Saw expected NegativeArraySizeException #2");
 }
 /* Test repetitions.  If the test succeeds-mostly, it succeeds,
 * as long as it does not crash (the outcome if the exception range
 * table entry for the array allocation is missing).
 */
-int N = 12;
+passed = 0;
-for (int n = 0; n < N; n++) {
+int limit = 6;
+while (passed != limit) {
 threadTest();
 }
-if (passed > N/2) {
-System.out.println("Saw " + passed + " out of " + N + " possible ThreadDeath hits");
-System.out.println("PASSED");
-} else {
-System.out.println("Too few ThreadDeath hits; expected at least " + N/2 +
-" but saw only " + passed);
-fail();
-}
 }
+}
-static void fail() {
-System.out.println("FAILED");
-System.exit(97);
-}
-};

changeset 59116	8e7f29b1ad4a
parent 50407	3dfdcca00ecc