Skip to content

Commit f49b9d1

Browse files
fniephausfniephaus
committed
[GR-25654] Migrate from createCallTarget() to getCallTarget().
PullRequest: graal/9887
2 parents d465c58 + ad460e2 commit f49b9d1

File tree

235 files changed

+971
-1223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

235 files changed

+971
-1223
lines changed

‎compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTestTVMCI.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ protected GraalTestContext createTestContext(String testName) {
109109

110110
@Override
111111
public OptimizedCallTarget createTestCallTarget(GraalTestContext testContext, RootNode testNode) {
112-
OptimizedCallTarget target = (OptimizedCallTarget) truffleRuntime.createCallTarget(testNode);
112+
OptimizedCallTarget target = (OptimizedCallTarget) testNode.getCallTarget();
113113
testContext.init(target);
114114
return target;
115115
}

‎compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedBlockNode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ public static final class PartialBlocks<T extends Node> {
647647
PartialBlockRootNode<T> partialRootNode = new PartialBlockRootNode<>(new FrameDescriptor(), block, startIndex, endIndex, blockIndex);
648648
GraalRuntimeAccessor.NODES.applyPolyglotEngine(rootNode, partialRootNode);
649649

650-
targets[i] = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(partialRootNode);
650+
targets[i] = (OptimizedCallTarget) partialRootNode.getCallTarget();
651651
targets[i].setNonTrivialNodeCount(blockSizes[i]);
652652
// we know the parameter types for block compilations. No need to check, lets cast
653653
// them unsafely.

‎compiler/src/org.graalvm.compiler.truffle.test.jdk11/src/org/graalvm/compiler/truffle/test/jdk11/VarHandlePartialEvaluationTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import org.junit.Test;
3939

4040
import com.oracle.truffle.api.RootCallTarget;
41-
import com.oracle.truffle.api.Truffle;
4241
import com.oracle.truffle.api.frame.FrameDescriptor;
4342
import com.oracle.truffle.api.frame.VirtualFrame;
4443
import com.oracle.truffle.api.nodes.RootNode;
@@ -89,7 +88,7 @@ public void byteBufferHandleSet() {
8988
private void testCommon(AbstractTestNode testNode, String testName, Object... args) {
9089
FrameDescriptor fd = new FrameDescriptor();
9190
RootNode rootNode = new RootTestNode(fd, testName, testNode);
92-
RootCallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);
91+
RootCallTarget callTarget = rootNode.getCallTarget();
9392
Assert.assertEquals(42, callTarget.call(args));
9493
assertPartialEvalNoInvokes(callTarget, args);
9594
}

‎compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AOTSupportCompilationTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
import org.graalvm.compiler.nodes.StructuredGraph;
2828
import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
29-
import org.graalvm.compiler.truffle.runtime.GraalTruffleRuntime;
3029
import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget;
3130
import org.graalvm.polyglot.Context;
3231
import org.junit.Test;
@@ -115,7 +114,7 @@ private TestRootNode setup(BaseNode node, Object receiver) {
115114
context.initialize(ProxyLanguage.ID);
116115
context.enter();
117116
TestRootNode root = new TestRootNode(TestLanguage.getCurrentLanguage(), node, receiver);
118-
GraalTruffleRuntime.getRuntime().createCallTarget(root);
117+
root.getCallTarget();
119118
context.leave();
120119
return root;
121120
}

‎compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AbstractSplittingStrategyTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ protected static void reflectivelySetField(Object o, String fieldName, Object va
134134

135135
protected static void createDummyTargetsToBoostGrowingSplitLimit() {
136136
for (int i = 0; i < 10; i++) {
137-
runtime.createCallTarget(new DummyRootNode());
137+
new DummyRootNode().getCallTarget();
138138
}
139139
}
140140

‎compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AgnosticInliningPhaseTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ public boolean hasNextTier() {
9191
return request.graph;
9292
}
9393

94-
protected final OptimizedCallTarget createDummyNode() {
95-
return (OptimizedCallTarget) runtime.createCallTarget(new RootNode(null) {
94+
protected static final OptimizedCallTarget createDummyNode() {
95+
return (OptimizedCallTarget) new RootNode(null) {
9696
@Override
9797
public Object execute(VirtualFrame frame) {
9898
return null;
9999
}
100-
});
100+
}.getCallTarget();
101101
}
102102

103103
protected class CallsInnerNodeTwice extends RootNode {

‎compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AllocationReporterPartialEvaluationTest.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,11 @@
2828
import static org.junit.Assert.assertNotNull;
2929
import static org.junit.Assert.assertTrue;
3030

31-
import org.graalvm.compiler.truffle.runtime.GraalTruffleRuntime;
3231
import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget;
3332
import org.graalvm.polyglot.Context;
3433
import org.graalvm.polyglot.PolyglotAccess;
3534
import org.junit.Test;
3635

37-
import com.oracle.truffle.api.Truffle;
3836
import com.oracle.truffle.api.TruffleLanguage;
3937
import com.oracle.truffle.api.frame.VirtualFrame;
4038
import com.oracle.truffle.api.instrumentation.AllocationEvent;
@@ -52,8 +50,6 @@
5250
*/
5351
public class AllocationReporterPartialEvaluationTest extends TestWithSynchronousCompiling {
5452

55-
private static final GraalTruffleRuntime runtime = (GraalTruffleRuntime) Truffle.getRuntime();
56-
5753
@Test
5854
public void testConsistentAssertions() {
5955
// Test that onEnter()/onReturnValue() are not broken
@@ -64,20 +60,20 @@ public void testConsistentAssertions() {
6460
assertNotNull(tester);
6561
final AllocationReporter reporter = (AllocationReporter) context.getPolyglotBindings().getMember(AllocationReporter.class.getSimpleName()).asHostObject();
6662
final Long[] value = new Long[]{1L};
67-
OptimizedCallTarget enterTarget = (OptimizedCallTarget) runtime.createCallTarget(new RootNode(null) {
63+
OptimizedCallTarget enterTarget = (OptimizedCallTarget) new RootNode(null) {
6864
@Override
6965
public Object execute(VirtualFrame frame) {
7066
reporter.onEnter(value[0], 4, 8);
7167
return null;
7268
}
73-
});
74-
OptimizedCallTarget returnTarget = (OptimizedCallTarget) runtime.createCallTarget(new RootNode(null) {
69+
}.getCallTarget();
70+
OptimizedCallTarget returnTarget = (OptimizedCallTarget) new RootNode(null) {
7571
@Override
7672
public Object execute(VirtualFrame frame) {
7773
reporter.onReturnValue(value[0], 4, 8);
7874
return null;
7975
}
80-
});
76+
}.getCallTarget();
8177

8278
// Interpret both:
8379
assertNotCompiled(enterTarget);

‎compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AssumedValuePartialEvaluationTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
*/
2525
package org.graalvm.compiler.truffle.test;
2626

27-
import com.oracle.truffle.api.Truffle;
28-
import com.oracle.truffle.api.frame.FrameDescriptor;
29-
import com.oracle.truffle.api.frame.VirtualFrame;
30-
import com.oracle.truffle.api.utilities.AssumedValue;
3127
import org.graalvm.compiler.nodes.StructuredGraph;
3228
import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget;
3329
import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode;
3430
import org.graalvm.compiler.truffle.test.nodes.RootTestNode;
3531
import org.junit.Assert;
3632
import org.junit.Test;
3733

34+
import com.oracle.truffle.api.frame.FrameDescriptor;
35+
import com.oracle.truffle.api.frame.VirtualFrame;
36+
import com.oracle.truffle.api.utilities.AssumedValue;
37+
3838
public class AssumedValuePartialEvaluationTest extends PartialEvaluationTest {
3939

4040
public static Object constant42() {
@@ -73,7 +73,7 @@ public void testDynamic() {
7373
AssumedValue<Integer> value = new AssumedValue<>(42);
7474

7575
RootTestNode root = new RootTestNode(new FrameDescriptor(), "assumedValue", new ReadDynamicAssumedValueNode());
76-
OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(root);
76+
OptimizedCallTarget target = (OptimizedCallTarget) root.getCallTarget();
7777

7878
StructuredGraph graph = partialEval(target, new Object[]{value});
7979
compile(target, graph);
@@ -87,7 +87,7 @@ public void testDynamicNoDeopt() {
8787
AssumedValue<Integer> value = new AssumedValue<>(42);
8888

8989
RootTestNode root = new RootTestNode(new FrameDescriptor(), "assumedValue", new ReadDynamicAssumedValueNode());
90-
OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(root);
90+
OptimizedCallTarget target = (OptimizedCallTarget) root.getCallTarget();
9191

9292
StructuredGraph graph = partialEval(target, new Object[]{value});
9393
compile(target, graph);

‎compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/BytecodeInterpreterPartialEvaluationTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import com.oracle.truffle.api.CompilerDirectives;
4141
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
4242
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
43-
import com.oracle.truffle.api.Truffle;
4443
import com.oracle.truffle.api.frame.FrameDescriptor;
4544
import com.oracle.truffle.api.frame.FrameSlot;
4645
import com.oracle.truffle.api.frame.FrameSlotKind;
@@ -257,7 +256,7 @@ public static Object constant42() {
257256
}
258257

259258
private static void assertReturns42(RootNode program) {
260-
Object result = Truffle.getRuntime().createCallTarget(program).call();
259+
Object result = program.getCallTarget().call();
261260
Assert.assertEquals(Integer.valueOf(42), result);
262261
}
263262

0 commit comments

Comments
 (0)