OpenJDK / valhalla / valhalla
changeset 54407:ab7ea72963c9 nestmates
[nestmates] fix up illegal nested inner class to be defined in a different runtime package
| author | mchung |
|---|---|
| date | Fri, 22 Feb 2019 16:54:55 -0800 |
| parents | 5d348fc091e0 |
| children | 73e3eeab3c0c |
| files | test/hotspot/jtreg/compiler/codecache/stress/Helper.java test/hotspot/jtreg/compiler/codecache/stress/RandomAllocationTest.java test/hotspot/jtreg/compiler/codecache/stress/ReturnBlobToWrongHeapTest.java test/hotspot/jtreg/compiler/codecache/stress/TestCaseImpl.java test/hotspot/jtreg/compiler/codecache/stress/UnexpectedDeoptimizationTest.java |
| diffstat | 5 files changed, 59 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/test/hotspot/jtreg/compiler/codecache/stress/Helper.java Fri Feb 22 16:54:10 2019 -0800 +++ b/test/hotspot/jtreg/compiler/codecache/stress/Helper.java Fri Feb 22 16:54:55 2019 -0800 @@ -40,7 +40,7 @@ public static final Random RNG = Utils.getRandomInstance(); private static final long THRESHOLD = WHITE_BOX.getIntxVMFlag("CompileThreshold"); - private static final String TEST_CASE_IMPL_CLASS_NAME = "compiler.codecache.stress.Helper$TestCaseImpl"; + private static final String TEST_CASE_IMPL_CLASS_NAME = "compiler.codecache.stress.TestCaseImpl"; private static byte[] CLASS_DATA; static { try { @@ -109,34 +109,4 @@ int method(); int expectedValue(); } - - public static class TestCaseImpl implements TestCase { - private static final int RETURN_VALUE = 42; - private static final int RECURSION_DEPTH = 10; - private volatile int i; - - @Override - public Callable<Integer> getCallable() { - return () -> { - i = 0; - return method(); - }; - } - - @Override - public int method() { - ++i; - int result = RETURN_VALUE; - if (i < RECURSION_DEPTH) { - return result + method(); - } - return result; - } - - @Override - public int expectedValue() { - return RETURN_VALUE * RECURSION_DEPTH; - } - } - }
--- a/test/hotspot/jtreg/compiler/codecache/stress/RandomAllocationTest.java Fri Feb 22 16:54:10 2019 -0800 +++ b/test/hotspot/jtreg/compiler/codecache/stress/RandomAllocationTest.java Fri Feb 22 16:54:55 2019 -0800 @@ -29,7 +29,7 @@ * @modules java.base/jdk.internal.misc * java.management * - * @build sun.hotspot.WhiteBox + * @build sun.hotspot.WhiteBox compiler.codecache.stress.Helper compiler.codecache.stress.TestCaseImpl * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/hotspot/jtreg/compiler/codecache/stress/ReturnBlobToWrongHeapTest.java Fri Feb 22 16:54:10 2019 -0800 +++ b/test/hotspot/jtreg/compiler/codecache/stress/ReturnBlobToWrongHeapTest.java Fri Feb 22 16:54:55 2019 -0800 @@ -29,7 +29,7 @@ * @modules java.base/jdk.internal.misc * java.management * - * @build sun.hotspot.WhiteBox + * @build sun.hotspot.WhiteBox compiler.codecache.stress.Helper compiler.codecache.stress.TestCaseImpl * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/hotspot/jtreg/compiler/codecache/stress/TestCaseImpl.java Fri Feb 22 16:54:55 2019 -0800 @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2014, 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. + * + * 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. + */ + +package compiler.codecache.stress; + +import java.util.concurrent.Callable; + +public class TestCaseImpl implements Helper.TestCase { + private static final int RETURN_VALUE = 42; + private static final int RECURSION_DEPTH = 10; + private volatile int i; + + @Override + public Callable<Integer> getCallable() { + return () -> { + i = 0; + return method(); + }; + } + + @Override + public int method() { + ++i; + int result = RETURN_VALUE; + if (i < RECURSION_DEPTH) { + return result + method(); + } + return result; + } + + @Override + public int expectedValue() { + return RETURN_VALUE * RECURSION_DEPTH; + } +}
--- a/test/hotspot/jtreg/compiler/codecache/stress/UnexpectedDeoptimizationTest.java Fri Feb 22 16:54:10 2019 -0800 +++ b/test/hotspot/jtreg/compiler/codecache/stress/UnexpectedDeoptimizationTest.java Fri Feb 22 16:54:55 2019 -0800 @@ -29,7 +29,7 @@ * @modules java.base/jdk.internal.misc * java.management * - * @build sun.hotspot.WhiteBox + * @build sun.hotspot.WhiteBox compiler.codecache.stress.Helper compiler.codecache.stress.TestCaseImpl * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions