# HG changeset patch # Parent d3dadc9e99dcdaa087ad94017f61fe6346be6a91 diff --git a/test/compiler/jsr292/NonInlinedCall/GCTest.java b/test/compiler/jsr292/NonInlinedCall/GCTest.java deleted file mode 100644 --- a/test/compiler/jsr292/NonInlinedCall/GCTest.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright (c) 2015, 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 8072008 - * @library /testlibrary /test/lib - * @compile GCTest.java NonInlinedReinvoker.java - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission - * java.lang.invoke.GCTest - * java.lang.invoke.GCTest$T - * java.lang.invoke.NonInlinedReinvoker - * jdk.test.lib.Asserts - * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions - * -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI - * -Xbatch -XX:-TieredCompilation -XX:CICompilerCount=1 - * java.lang.invoke.GCTest - */ -package java.lang.invoke; - -import sun.hotspot.WhiteBox; -import jdk.internal.vm.annotation.DontInline; -import jdk.internal.vm.annotation.Stable; -import java.lang.ref.*; -import static jdk.test.lib.Asserts.*; - -public class GCTest { - static final MethodHandles.Lookup LOOKUP = MethodHandles.Lookup.IMPL_LOOKUP; - - static class T { - static int f1() { return 0; } - static int f2() { return 1; } - } - - static @Stable MethodHandle mh; - static PhantomReference lform; - - static final ReferenceQueue rq = new ReferenceQueue<>(); - static final WhiteBox WB = WhiteBox.getWhiteBox(); - - @DontInline - static int invokeBasic() { - try { - return (int) mh.invokeBasic(); - } catch (Throwable e) { - throw new Error(e); - } - } - - static void test(int expected) { - for (int i = 0; i < 20_000; i++) { - invokeBasic(); - } - assertEquals(invokeBasic(), expected); - } - - public static void main(String[] args) throws Exception { - mh = NonInlinedReinvoker.make( - LOOKUP.findStatic(T.class, "f1", MethodType.methodType(int.class))); - - // Monitor LambdaForm GC - lform = new PhantomReference<>(mh.form, rq); - - test(0); - WB.clearInlineCaches(); - test(0); - - mh = NonInlinedReinvoker.make( - LOOKUP.findStatic(T.class, "f2", MethodType.methodType(int.class))); - - Reference ref = null; - while (ref == null) { - WB.fullGC(); - try { - ref = rq.remove(1000); - } catch (InterruptedException e) { /*ignore*/ } - } - - test(1); - WB.clearInlineCaches(); - test(1); - - System.out.println("TEST PASSED"); - } -} diff --git a/test/compiler/jsr292/NonInlinedCall/InvokeTest.java b/test/compiler/jsr292/NonInlinedCall/InvokeTest.java --- a/test/compiler/jsr292/NonInlinedCall/InvokeTest.java +++ b/test/compiler/jsr292/NonInlinedCall/InvokeTest.java @@ -25,7 +25,7 @@ * @test * @bug 8072008 * @library /testlibrary /test/lib - * @compile InvokeTest.java NonInlinedReinvoker.java + * @compile InvokeTest.java * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * java.lang.invoke.InvokeTest @@ -33,7 +33,6 @@ * java.lang.invoke.InvokeTest$P1 * java.lang.invoke.InvokeTest$P2 * java.lang.invoke.InvokeTest$I - * java.lang.invoke.NonInlinedReinvoker * jdk.test.lib.Asserts * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions * -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI @@ -53,7 +52,6 @@ static final MethodHandle staticMH; // invokestatic T.f2 static final MethodHandle intfMH; // invokeinterface I.f1 static final MethodHandle specialMH; // invokespecial T.f4 T - static final MethodHandle basicMH; static final WhiteBox WB = WhiteBox.getWhiteBox(); @@ -67,7 +65,6 @@ staticMH = LOOKUP.findStatic (T.class, "f2", mtype); intfMH = LOOKUP.findVirtual(I.class, "f3", mtype); specialMH = LOOKUP.findSpecial(T.class, "f4", mtype, T.class); - basicMH = NonInlinedReinvoker.make(staticMH); } catch (Exception e) { throw new Error(e); } @@ -133,16 +130,6 @@ } } - @DontInline - static void invokeBasic() { - try { - Class cls = (Class)basicMH.invokeBasic(); - assertEquals(cls, T.class); - } catch (Throwable e) { - throw new Error(e); - } - } - static void run(Runnable r) { for (int i = 0; i < 20_000; i++) { r.run(); @@ -203,17 +190,10 @@ run(() -> linkToStatic()); } - static void testBasic() { - System.out.println("invokeBasic"); - // static call - run(() -> invokeBasic()); - } - public static void main(String[] args) { testVirtual(); testInterface(); testSpecial(); testStatic(); - testBasic(); } } diff --git a/test/compiler/jsr292/NonInlinedCall/NonInlinedReinvoker.java b/test/compiler/jsr292/NonInlinedCall/NonInlinedReinvoker.java deleted file mode 100644 --- a/test/compiler/jsr292/NonInlinedCall/NonInlinedReinvoker.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2015, 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 java.lang.invoke; - -class NonInlinedReinvoker extends DelegatingMethodHandle { - private final MethodHandle target; - - private NonInlinedReinvoker(MethodHandle target, LambdaForm lf) { - super(target.type(), lf); - this.target = target; - } - @Override - protected MethodHandle getTarget() { - return target; - } - - @Override - MethodHandle asTypeUncached(MethodType newType) { - return asTypeCache = target.asType(newType); - } - - static MethodHandle make(MethodHandle target) { - LambdaForm lform = DelegatingMethodHandle.makeReinvokerForm( - target, -1, DelegatingMethodHandle.class, "reinvoker.dontInline", - /*forceInline=*/false, DelegatingMethodHandle.NF_getTarget, null); - return new NonInlinedReinvoker(target, lform); - } -} diff --git a/test/compiler/jsr292/NonInlinedCall/RedefineTest.java b/test/compiler/jsr292/NonInlinedCall/RedefineTest.java --- a/test/compiler/jsr292/NonInlinedCall/RedefineTest.java +++ b/test/compiler/jsr292/NonInlinedCall/RedefineTest.java @@ -95,7 +95,7 @@ static final WhiteBox WB = WhiteBox.getWhiteBox(); @DontInline - static int invokeBasic() { + static int invoke() { try { return (int)mh.invokeExact(); } catch (Throwable e) { @@ -111,7 +111,7 @@ public static void main(String[] args) throws Exception { for (int i = 0; i < 20_000; i++) { - int r = invokeBasic(); + int r = invoke(); if (r != 0) { throw new Error(r + " != 0"); } @@ -123,7 +123,7 @@ int exp = (instr != null) ? 1 : 0; for (int i = 0; i < 20_000; i++) { - if (invokeBasic() != exp) { + if (invoke() != exp) { throw new Error(); } } @@ -131,7 +131,7 @@ WB.clearInlineCaches(); for (int i = 0; i < 20_000; i++) { - if (invokeBasic() != exp) { + if (invoke() != exp) { throw new Error(); } }