author | iignatyev |
Fri, 07 Jun 2019 21:35:26 -0700 | |
changeset 55301 | a9188ba494a3 |
parent 52015 | 821bfc24d750 |
permissions | -rw-r--r-- |
35086
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
1 |
/* |
52015
821bfc24d750
8181443: Replace usages of jdk.internal.misc.Unsafe with MethodHandles.Lookup.defineClass
mchung
parents:
47216
diff
changeset
|
2 |
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. |
35086
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
4 |
* |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
8 |
* |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
13 |
* accompanied this code). |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
14 |
* |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
18 |
* |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
21 |
* questions. |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
22 |
*/ |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
23 |
|
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
24 |
/* |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
25 |
* @test |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
26 |
* @bug 8072008 |
36508 | 27 |
* @modules java.base/jdk.internal.org.objectweb.asm |
28 |
* java.base/jdk.internal.misc |
|
29 |
* java.base/jdk.internal.vm.annotation |
|
40631
ed82623d7831
8157957: ClassNotFoundException: jdk.test.lib.JDKToolFinder
ctornqvi
parents:
40059
diff
changeset
|
30 |
* @library /test/lib / ../patches |
39428
24cb2cb4ae0b
8159149: Several compiler tests fail with minimal VM
iignatyev
parents:
38207
diff
changeset
|
31 |
* @requires vm.flavor != "minimal" |
40053
b3617982544e
8160657: Compiler HotSpot tests should use the "run driver" directive where applicable
iignatyev
parents:
39428
diff
changeset
|
32 |
* |
36508 | 33 |
* @build sun.hotspot.WhiteBox |
40059 | 34 |
* java.base/java.lang.invoke.MethodHandleHelper |
35 |
* compiler.jsr292.NonInlinedCall.RedefineTest |
|
40053
b3617982544e
8160657: Compiler HotSpot tests should use the "run driver" directive where applicable
iignatyev
parents:
39428
diff
changeset
|
36 |
* @run driver compiler.jsr292.NonInlinedCall.Agent |
b3617982544e
8160657: Compiler HotSpot tests should use the "run driver" directive where applicable
iignatyev
parents:
39428
diff
changeset
|
37 |
* agent.jar |
b3617982544e
8160657: Compiler HotSpot tests should use the "run driver" directive where applicable
iignatyev
parents:
39428
diff
changeset
|
38 |
* compiler.jsr292.NonInlinedCall.RedefineTest |
b3617982544e
8160657: Compiler HotSpot tests should use the "run driver" directive where applicable
iignatyev
parents:
39428
diff
changeset
|
39 |
* @run driver ClassFileInstaller sun.hotspot.WhiteBox |
b3617982544e
8160657: Compiler HotSpot tests should use the "run driver" directive where applicable
iignatyev
parents:
39428
diff
changeset
|
40 |
* sun.hotspot.WhiteBox$WhiteBoxPermission |
b3617982544e
8160657: Compiler HotSpot tests should use the "run driver" directive where applicable
iignatyev
parents:
39428
diff
changeset
|
41 |
* compiler.jsr292.NonInlinedCall.RedefineTest |
38188
e76af590ea2f
8155751: Some tests miss othervm for main/bootclasspath mode
vlivanov
parents:
36508
diff
changeset
|
42 |
* @run main/bootclasspath/othervm -javaagent:agent.jar |
e76af590ea2f
8155751: Some tests miss othervm for main/bootclasspath mode
vlivanov
parents:
36508
diff
changeset
|
43 |
* -XX:+IgnoreUnrecognizedVMOptions |
e76af590ea2f
8155751: Some tests miss othervm for main/bootclasspath mode
vlivanov
parents:
36508
diff
changeset
|
44 |
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI |
e76af590ea2f
8155751: Some tests miss othervm for main/bootclasspath mode
vlivanov
parents:
36508
diff
changeset
|
45 |
* -Xbatch -XX:-TieredCompilation -XX:CICompilerCount=1 |
e76af590ea2f
8155751: Some tests miss othervm for main/bootclasspath mode
vlivanov
parents:
36508
diff
changeset
|
46 |
* compiler.jsr292.NonInlinedCall.RedefineTest |
35086
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
47 |
*/ |
36508 | 48 |
|
49 |
package compiler.jsr292.NonInlinedCall; |
|
35086
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
50 |
|
40059 | 51 |
import jdk.internal.org.objectweb.asm.ClassWriter; |
52 |
import jdk.internal.org.objectweb.asm.MethodVisitor; |
|
53 |
import jdk.internal.vm.annotation.DontInline; |
|
35086
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
54 |
import sun.hotspot.WhiteBox; |
36508 | 55 |
|
35086
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
56 |
import java.lang.instrument.ClassDefinition; |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
57 |
import java.lang.instrument.Instrumentation; |
36508 | 58 |
import java.lang.invoke.MethodHandle; |
40059 | 59 |
import java.lang.invoke.MethodHandleHelper; |
36508 | 60 |
import java.lang.invoke.MethodHandles; |
61 |
import java.lang.invoke.MethodType; |
|
62 |
||
40059 | 63 |
import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; |
64 |
import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC; |
|
65 |
import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER; |
|
66 |
import static jdk.internal.org.objectweb.asm.Opcodes.IRETURN; |
|
35086
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
67 |
|
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
68 |
public class RedefineTest { |
36508 | 69 |
static final MethodHandles.Lookup LOOKUP = MethodHandleHelper.IMPL_LOOKUP; |
70 |
static final String NAME = "compiler/jsr292/NonInlinedCall/RedefineTest$T"; |
|
35086
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
71 |
|
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
72 |
static Class<?> getClass(int r) { |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
73 |
byte[] classFile = getClassFile(r); |
52015
821bfc24d750
8181443: Replace usages of jdk.internal.misc.Unsafe with MethodHandles.Lookup.defineClass
mchung
parents:
47216
diff
changeset
|
74 |
try { |
821bfc24d750
8181443: Replace usages of jdk.internal.misc.Unsafe with MethodHandles.Lookup.defineClass
mchung
parents:
47216
diff
changeset
|
75 |
return MethodHandles.lookup().defineClass(classFile); |
821bfc24d750
8181443: Replace usages of jdk.internal.misc.Unsafe with MethodHandles.Lookup.defineClass
mchung
parents:
47216
diff
changeset
|
76 |
} catch (IllegalAccessException e) { |
821bfc24d750
8181443: Replace usages of jdk.internal.misc.Unsafe with MethodHandles.Lookup.defineClass
mchung
parents:
47216
diff
changeset
|
77 |
throw new Error(e); |
821bfc24d750
8181443: Replace usages of jdk.internal.misc.Unsafe with MethodHandles.Lookup.defineClass
mchung
parents:
47216
diff
changeset
|
78 |
} |
35086
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
79 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
80 |
|
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
81 |
/** |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
82 |
* Generates a class of the following shape: |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
83 |
* static class T { |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
84 |
* @DontInline public static int f() { return $r; } |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
85 |
* } |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
86 |
*/ |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
87 |
static byte[] getClassFile(int r) { |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
88 |
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
89 |
MethodVisitor mv; |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
90 |
cw.visit(52, ACC_PUBLIC | ACC_SUPER, NAME, null, "java/lang/Object", null); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
91 |
{ |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
92 |
mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "f", "()I", null, null); |
35099
982950884444
8144223: Move j.l.invoke.{ForceInline, DontInline, Stable} to jdk.internal.vm.annotation package
psandoz
parents:
35086
diff
changeset
|
93 |
mv.visitAnnotation("Ljdk/internal/vm/annotation/DontInline;", true); |
35086
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
94 |
mv.visitCode(); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
95 |
mv.visitLdcInsn(r); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
96 |
mv.visitInsn(IRETURN); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
97 |
mv.visitMaxs(0, 0); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
98 |
mv.visitEnd(); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
99 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
100 |
cw.visitEnd(); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
101 |
return cw.toByteArray(); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
102 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
103 |
|
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
104 |
static final MethodHandle mh; |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
105 |
static final Class<?> CLS = getClass(0); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
106 |
static { |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
107 |
try { |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
108 |
mh = LOOKUP.findStatic(CLS, "f", MethodType.methodType(int.class)); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
109 |
} catch (Exception e) { |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
110 |
throw new Error(e); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
111 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
112 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
113 |
|
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
114 |
static final WhiteBox WB = WhiteBox.getWhiteBox(); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
115 |
|
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
116 |
@DontInline |
55301
a9188ba494a3
8149040: Cleanup compiler/jsr292/NonInlinedCall tests after JDK-8148994
iignatyev
parents:
52015
diff
changeset
|
117 |
static int invokeExact() { |
35086
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
118 |
try { |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
119 |
return (int)mh.invokeExact(); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
120 |
} catch (Throwable e) { |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
121 |
throw new Error(e); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
122 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
123 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
124 |
|
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
125 |
static Instrumentation instr; |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
126 |
public static void premain(String args, Instrumentation instr) { |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
127 |
RedefineTest.instr = instr; |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
128 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
129 |
|
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
130 |
|
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
131 |
public static void main(String[] args) throws Exception { |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
132 |
for (int i = 0; i < 20_000; i++) { |
55301
a9188ba494a3
8149040: Cleanup compiler/jsr292/NonInlinedCall tests after JDK-8148994
iignatyev
parents:
52015
diff
changeset
|
133 |
int r = invokeExact(); |
35086
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
134 |
if (r != 0) { |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
135 |
throw new Error(r + " != 0"); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
136 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
137 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
138 |
// WB.ensureCompiled(); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
139 |
|
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
140 |
redefine(); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
141 |
|
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
142 |
int exp = (instr != null) ? 1 : 0; |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
143 |
|
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
144 |
for (int i = 0; i < 20_000; i++) { |
55301
a9188ba494a3
8149040: Cleanup compiler/jsr292/NonInlinedCall tests after JDK-8148994
iignatyev
parents:
52015
diff
changeset
|
145 |
if (invokeExact() != exp) { |
35086
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
146 |
throw new Error(); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
147 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
148 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
149 |
|
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
150 |
WB.clearInlineCaches(); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
151 |
|
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
152 |
for (int i = 0; i < 20_000; i++) { |
55301
a9188ba494a3
8149040: Cleanup compiler/jsr292/NonInlinedCall tests after JDK-8148994
iignatyev
parents:
52015
diff
changeset
|
153 |
if (invokeExact() != exp) { |
35086
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
154 |
throw new Error(); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
155 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
156 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
157 |
|
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
158 |
// WB.ensureCompiled(); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
159 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
160 |
|
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
161 |
static void redefine() { |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
162 |
if (instr == null) { |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
163 |
System.out.println("NOT REDEFINED"); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
164 |
return; |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
165 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
166 |
ClassDefinition cd = new ClassDefinition(CLS, getClassFile(1)); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
167 |
try { |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
168 |
instr.redefineClasses(cd); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
169 |
} catch (Exception e) { |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
170 |
throw new Error(e); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
171 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
172 |
System.out.println("REDEFINED"); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
173 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
diff
changeset
|
174 |
} |