From b40cfe9bfd3217c7c84bdde495fe26b499442305 Mon Sep 17 00:00:00 2001 From: Matt D'Souza Date: Tue, 27 Aug 2024 16:12:29 -0400 Subject: [PATCH] Refactor: require root node constructor parameter to have concrete language type --- .../truffle/test/BytecodeDSLOSRTest.java | 4 +- truffle/docs/bytecode_dsl/BytecodeDSL.md | 6 +-- .../bytecode/BytecodeBenchmarkRootNode.java | 7 +-- .../bytecode/test/BoxingEliminationTest.java | 3 +- .../test/BoxingEliminationTypeSystemTest.java | 3 +- .../bytecode/test/ConstantOperandTest.java | 7 ++- .../api/bytecode/test/DeadCodeTest.java | 3 +- .../test/ExceptionInterceptionTest.java | 11 ++-- .../test/InstructionBytecodeSizeTest.java | 18 +++---- .../bytecode/test/InstrumentationTest.java | 4 +- .../api/bytecode/test/LocalHelpersTest.java | 3 +- .../api/bytecode/test/PrologEpilogTest.java | 19 ++++--- .../api/bytecode/test/QuickeningTest.java | 13 +++-- .../test/ReadBytecodeLocationTest.java | 3 +- .../api/bytecode/test/SetTraceFuncTest.java | 3 +- .../api/bytecode/test/ShortCircuitTest.java | 3 +- .../api/bytecode/test/StackTraceTest.java | 4 +- .../truffle/api/bytecode/test/TagTest.java | 22 ++++---- .../api/bytecode/test/TypeSystemTest.java | 14 +++-- .../api/bytecode/test/VariadicTest.java | 2 +- .../basic_interpreter/BasicInterpreter.java | 3 +- .../bytecode/test/error_tests/ErrorTests.java | 54 ++++++++++--------- .../error_tests/TestVariantErrorTest.java | 8 +-- .../test/examples/BuiltinTutorial.java | 2 +- .../test/examples/ContinuationsTutorial.java | 5 +- .../test/examples/GettingStarted.java | 2 +- .../bytecode/test/examples/Introduction.java | 3 +- .../test/examples/SerializationTutorial.java | 2 +- .../truffle/api/bytecode/BytecodeNode.java | 3 +- .../bytecode/parser/BytecodeDSLParser.java | 6 +-- .../sl/bytecode/SLBytecodeRootNode.java | 5 +- 31 files changed, 110 insertions(+), 135 deletions(-) diff --git a/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/BytecodeDSLOSRTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/BytecodeDSLOSRTest.java index 64b1105ab992a..561f3cd50d6cf 100644 --- a/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/BytecodeDSLOSRTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/BytecodeDSLOSRTest.java @@ -306,7 +306,7 @@ static class InCompiledCodeException extends AbstractTruffleException { private static final long serialVersionUID = 1L; } - protected BytecodeDSLOSRTestRootNode(TruffleLanguage language, FrameDescriptor fd) { + protected BytecodeDSLOSRTestRootNode(BytecodeDSLOSRTestLanguage language, FrameDescriptor fd) { super(language, fd); } @@ -384,7 +384,7 @@ private static void enableInstrumentation(BytecodeDSLOSRTestRootNode root) { @GenerateBytecode(languageClass = BytecodeDSLOSRTestLanguage.class, enableYield = true) public abstract static class BytecodeDSLOSRTestRootNodeWithYield extends DebugBytecodeRootNode { - protected BytecodeDSLOSRTestRootNodeWithYield(TruffleLanguage language, FrameDescriptor fd) { + protected BytecodeDSLOSRTestRootNodeWithYield(BytecodeDSLOSRTestLanguage language, FrameDescriptor fd) { super(language, fd); } diff --git a/truffle/docs/bytecode_dsl/BytecodeDSL.md b/truffle/docs/bytecode_dsl/BytecodeDSL.md index d43465a55bcf9..bca7db3b075ba 100644 --- a/truffle/docs/bytecode_dsl/BytecodeDSL.md +++ b/truffle/docs/bytecode_dsl/BytecodeDSL.md @@ -20,7 +20,7 @@ Below is the complete Bytecode DSL specification for a small interpreter with a @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class) public abstract static class SampleInterpreter extends RootNode implements BytecodeRootNode { - protected SampleInterpreter(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected SampleInterpreter(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -44,8 +44,8 @@ From this specification, Bytecode DSL generates a bytecode interpreter in `Sampl The generated code contains a builder class that automatically generates bytecode from a series of builder calls. We can build a bytecode program that adds two arguments as follows. ``` -var rootNodes = SampleInterpreterGen.create(BytecodeConfig.DEFAULT, b -> { - b.beginRoot(null); // TruffleLanguage goes here +var rootNodes = SampleInterpreterGen.create(getLanguage(), BytecodeConfig.DEFAULT, b -> { + b.beginRoot(); b.beginReturn(); b.beginAdd(); b.emitLoadArgument(0); diff --git a/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/bytecode/BytecodeBenchmarkRootNode.java b/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/bytecode/BytecodeBenchmarkRootNode.java index d64308cc2c371..1ef74056beea8 100644 --- a/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/bytecode/BytecodeBenchmarkRootNode.java +++ b/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/bytecode/BytecodeBenchmarkRootNode.java @@ -40,7 +40,6 @@ */ package com.oracle.truffle.api.benchmark.bytecode; -import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.bytecode.BytecodeRootNode; import com.oracle.truffle.api.bytecode.GenerateBytecode; import com.oracle.truffle.api.bytecode.GenerateBytecodeTestVariants; @@ -60,14 +59,10 @@ }) abstract class BytecodeBenchmarkRootNode extends RootNode implements BytecodeRootNode { - protected BytecodeBenchmarkRootNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BytecodeBenchmarkRootNode(BenchmarkLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } - protected BytecodeBenchmarkRootNode(TruffleLanguage language, FrameDescriptor.Builder frameDescriptor) { - super(language, frameDescriptor.build()); - } - @Operation static final class Add { @Specialization diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/BoxingEliminationTest.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/BoxingEliminationTest.java index 4d6cec27f759f..dd604b0d1ccdc 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/BoxingEliminationTest.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/BoxingEliminationTest.java @@ -48,7 +48,6 @@ import org.junit.Test; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.bytecode.BytecodeConfig; import com.oracle.truffle.api.bytecode.BytecodeLocal; import com.oracle.truffle.api.bytecode.BytecodeNode; @@ -1410,7 +1409,7 @@ private static BoxingEliminationTestRootNode parse(BytecodeParser language, + protected BoxingEliminationTestRootNode(BytecodeDSLTestLanguage language, FrameDescriptor.Builder frameDescriptor) { super(language, customize(frameDescriptor).build()); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/BoxingEliminationTypeSystemTest.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/BoxingEliminationTypeSystemTest.java index 6f731fc036852..670baad613689 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/BoxingEliminationTypeSystemTest.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/BoxingEliminationTypeSystemTest.java @@ -46,7 +46,6 @@ import org.junit.Test; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.bytecode.BytecodeConfig; import com.oracle.truffle.api.bytecode.BytecodeLocal; import com.oracle.truffle.api.bytecode.BytecodeNode; @@ -256,7 +255,7 @@ public void testCastConstantIntToLong() { @SuppressWarnings("unused") abstract static class BoxingEliminationTypeSystemRootNode extends DebugBytecodeRootNode implements BytecodeRootNode { - protected BoxingEliminationTypeSystemRootNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BoxingEliminationTypeSystemRootNode(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/ConstantOperandTest.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/ConstantOperandTest.java index 4fa2d731fba04..d18a915610e44 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/ConstantOperandTest.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/ConstantOperandTest.java @@ -55,7 +55,6 @@ import org.junit.runners.Parameterized.Parameters; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.bytecode.BytecodeConfig; import com.oracle.truffle.api.bytecode.BytecodeLocal; import com.oracle.truffle.api.bytecode.BytecodeNode; @@ -313,7 +312,7 @@ public void testConstantOperandsInPrologNestedRoot() { abstract class ConstantOperandTestRootNode extends RootNode implements BytecodeRootNode { - protected ConstantOperandTestRootNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected ConstantOperandTestRootNode(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -405,7 +404,7 @@ public static int doInt(@SuppressWarnings("unused") Object ignored, int replacem abstract class ConstantOperandsInPrologTestRootNode extends RootNode implements BytecodeRootNode { public final List prologEvents = new ArrayList<>(); - protected ConstantOperandsInPrologTestRootNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected ConstantOperandsInPrologTestRootNode(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -426,7 +425,7 @@ public static void doVoid(String name, int number, @Bind ConstantOperandsInProlo @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class) @SuppressWarnings("unused") abstract class ConstantOperandErrorRootNode extends RootNode implements BytecodeRootNode { - protected ConstantOperandErrorRootNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected ConstantOperandErrorRootNode(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/DeadCodeTest.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/DeadCodeTest.java index 9890d95dff877..7966073237dde 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/DeadCodeTest.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/DeadCodeTest.java @@ -45,7 +45,6 @@ import org.junit.Test; -import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.bytecode.BytecodeConfig; import com.oracle.truffle.api.bytecode.BytecodeLabel; import com.oracle.truffle.api.bytecode.BytecodeParser; @@ -960,7 +959,7 @@ private static DeadCodeTestRootNode parse(BytecodeParser language, + protected DeadCodeTestRootNode(BytecodeDSLTestLanguage language, FrameDescriptor.Builder frameDescriptor) { super(language, customize(frameDescriptor).build()); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/ExceptionInterceptionTest.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/ExceptionInterceptionTest.java index a1828f9658425..81f7aee66e860 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/ExceptionInterceptionTest.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/ExceptionInterceptionTest.java @@ -48,7 +48,6 @@ import org.junit.Assert; import org.junit.Test; -import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.bytecode.BytecodeConfig; import com.oracle.truffle.api.bytecode.BytecodeLocation; import com.oracle.truffle.api.bytecode.BytecodeNode; @@ -374,7 +373,7 @@ public void testInterceptsOnceWithExceptionalEpilog() { @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class) abstract class BytecodeNodeInterceptsAll extends RootNode implements BytecodeRootNode { - protected BytecodeNodeInterceptsAll(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BytecodeNodeInterceptsAll(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -527,7 +526,7 @@ public static Object perform(VirtualFrame frame, BytecodeNodeInterceptsAll calle @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class) abstract class BytecodeNodeInterceptsNothing extends RootNode implements BytecodeRootNode { - protected BytecodeNodeInterceptsNothing(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BytecodeNodeInterceptsNothing(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -553,7 +552,7 @@ public static Object perform() { @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class) abstract class BytecodeNodeInterceptsCF extends RootNode implements BytecodeRootNode { - protected BytecodeNodeInterceptsCF(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BytecodeNodeInterceptsCF(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -584,7 +583,7 @@ public static Object perform() { @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class) abstract class BytecodeNodeInterceptsInternal extends RootNode implements BytecodeRootNode { - protected BytecodeNodeInterceptsInternal(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BytecodeNodeInterceptsInternal(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -616,7 +615,7 @@ public static Object perform() { abstract class BytecodeNodeInterceptsTruffleWithEpilog extends RootNode implements BytecodeRootNode { public int interceptCount = 0; - protected BytecodeNodeInterceptsTruffleWithEpilog(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BytecodeNodeInterceptsTruffleWithEpilog(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/InstructionBytecodeSizeTest.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/InstructionBytecodeSizeTest.java index 61113fe5c07e8..45c970e4d4f87 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/InstructionBytecodeSizeTest.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/InstructionBytecodeSizeTest.java @@ -51,7 +51,6 @@ import org.junit.Test; -import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.bytecode.BytecodeConfig; import com.oracle.truffle.api.bytecode.BytecodeNode; import com.oracle.truffle.api.bytecode.BytecodeParser; @@ -60,7 +59,6 @@ import com.oracle.truffle.api.bytecode.BytecodeTier; import com.oracle.truffle.api.bytecode.GenerateBytecode; import com.oracle.truffle.api.bytecode.Operation; -import com.oracle.truffle.api.bytecode.test.VariadicTest.TestLanguage; import com.oracle.truffle.api.dsl.ImplicitCast; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.TypeSystem; @@ -184,14 +182,14 @@ private static ContinueAtSizes calculateSizes(BytecodeRootNode node) throws IOEx record ContinueAtSizes(int cached, int uncached) { } - @GenerateBytecode(languageClass = TestLanguage.class, // + @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class, // enableSerialization = true, // enableYield = true, // boxingEliminationTypes = {boolean.class}, // enableUncachedInterpreter = true) abstract static class OneOperationNode extends RootNode implements BytecodeRootNode { - protected OneOperationNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected OneOperationNode(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -205,14 +203,14 @@ static int doDefault(int a, int b) { } - @GenerateBytecode(languageClass = TestLanguage.class, // + @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class, // enableSerialization = true, // enableYield = true, // boxingEliminationTypes = {boolean.class}, // enableUncachedInterpreter = true) abstract static class TwoOperationNode extends RootNode implements BytecodeRootNode { - protected TwoOperationNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected TwoOperationNode(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -234,14 +232,14 @@ static int doDefault(int a, int b) { } - @GenerateBytecode(languageClass = TestLanguage.class, // + @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class, // enableSerialization = true, // enableYield = true, // boxingEliminationTypes = {boolean.class}, // enableUncachedInterpreter = true) abstract static class TwentyOperationNode extends RootNode implements BytecodeRootNode { - protected TwentyOperationNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected TwentyOperationNode(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -407,7 +405,7 @@ static int doDefault(int a, int b) { } - @GenerateBytecode(languageClass = TestLanguage.class, // + @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class, // enableSerialization = true, // enableYield = true, // boxingEliminationTypes = {boolean.class, int.class, byte.class, long.class, float.class, double.class}, // @@ -416,7 +414,7 @@ static int doDefault(int a, int b) { @SuppressWarnings({"unused", "truffle"}) abstract static class ManyInstructionNode extends RootNode implements BytecodeRootNode { - protected ManyInstructionNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected ManyInstructionNode(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/InstrumentationTest.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/InstrumentationTest.java index 533b2b1a4b421..b672a9b553014 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/InstrumentationTest.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/InstrumentationTest.java @@ -316,7 +316,7 @@ public void testBoxingElimination() { boxingEliminationTypes = {int.class}) public abstract static class InstrumentationTestRootNode extends DebugBytecodeRootNode implements BytecodeRootNode { - protected InstrumentationTestRootNode(TruffleLanguage language, + protected InstrumentationTestRootNode(BytecodeInstrumentationTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -478,7 +478,7 @@ protected Object createContext(Env env) { @GenerateBytecode(languageClass = BytecodeInstrumentationTestLanguage.class) public abstract static class InstrumentationErrorRootNode1 extends DebugBytecodeRootNode implements BytecodeRootNode { - protected InstrumentationErrorRootNode1(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected InstrumentationErrorRootNode1(BytecodeInstrumentationTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/LocalHelpersTest.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/LocalHelpersTest.java index 68db7ec20c2d3..e0f46c62b1352 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/LocalHelpersTest.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/LocalHelpersTest.java @@ -61,7 +61,6 @@ import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.Truffle; -import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.bytecode.BytecodeConfig; import com.oracle.truffle.api.bytecode.BytecodeLocal; import com.oracle.truffle.api.bytecode.BytecodeNode; @@ -793,7 +792,7 @@ public void testGetLocalNamesAndInfos() { abstract class BytecodeNodeWithLocalIntrospection extends DebugBytecodeRootNode implements BytecodeRootNode { public int reservedLocalIndex = -1; - protected BytecodeNodeWithLocalIntrospection(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BytecodeNodeWithLocalIntrospection(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/PrologEpilogTest.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/PrologEpilogTest.java index 51c1c6f43e612..b4b16fa70f573 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/PrologEpilogTest.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/PrologEpilogTest.java @@ -60,7 +60,6 @@ import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.bytecode.BytecodeConfig; import com.oracle.truffle.api.bytecode.BytecodeNode; import com.oracle.truffle.api.bytecode.BytecodeParser; @@ -531,7 +530,7 @@ abstract class PrologEpilogBytecodeNode extends DebugBytecodeRootNode implements transient RuntimeException throwInExceptionalEpilog = null; transient boolean internalExceptionIntercepted = false; - protected PrologEpilogBytecodeNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected PrologEpilogBytecodeNode(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -621,7 +620,7 @@ public static void doThrow(String message) { @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class) abstract class DuplicatePrologEpilogErrorNode extends RootNode implements BytecodeRootNode { - protected DuplicatePrologEpilogErrorNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected DuplicatePrologEpilogErrorNode(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -677,7 +676,7 @@ public static void doEpilog(AbstractTruffleException ex) { @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class) abstract class BadPrologErrorNode extends RootNode implements BytecodeRootNode { - protected BadPrologErrorNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BadPrologErrorNode(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -693,7 +692,7 @@ public static void doProlog(int x) { @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class) abstract class BadPrologErrorNode2 extends RootNode implements BytecodeRootNode { - protected BadPrologErrorNode2(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BadPrologErrorNode2(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -709,7 +708,7 @@ public static int doProlog() { @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class) abstract class BadEpilogErrorNode extends RootNode implements BytecodeRootNode { - protected BadEpilogErrorNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BadEpilogErrorNode(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -726,7 +725,7 @@ public static int doEpilog(int x, int y) { @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class) abstract class BadEpilogErrorNode2 extends RootNode implements BytecodeRootNode { - protected BadEpilogErrorNode2(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BadEpilogErrorNode2(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -747,7 +746,7 @@ public static void doEpilog2(String x) { @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class) abstract class BadExceptionalEpilogErrorNode1 extends RootNode implements BytecodeRootNode { - protected BadExceptionalEpilogErrorNode1(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BadExceptionalEpilogErrorNode1(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -763,7 +762,7 @@ public static void doEpilog(Object x, Object y) { @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class) abstract class BadExceptionalEpilogErrorNode2 extends RootNode implements BytecodeRootNode { - protected BadExceptionalEpilogErrorNode2(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BadExceptionalEpilogErrorNode2(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -799,7 +798,7 @@ public static void doPrimitive(int exception) { @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class) abstract class BadExceptionalEpilogErrorNode3 extends RootNode implements BytecodeRootNode { - protected BadExceptionalEpilogErrorNode3(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BadExceptionalEpilogErrorNode3(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/QuickeningTest.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/QuickeningTest.java index a79af134ebc80..2ded002dbaf84 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/QuickeningTest.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/QuickeningTest.java @@ -45,7 +45,6 @@ import org.junit.Test; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.bytecode.BytecodeConfig; import com.oracle.truffle.api.bytecode.BytecodeParser; import com.oracle.truffle.api.bytecode.BytecodeRootNode; @@ -195,7 +194,7 @@ private static QuickeningTestRootNode parse(BytecodeParser language, FrameDescriptor frameDescriptor) { + protected QuickeningTestRootNode(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -243,7 +242,7 @@ public static String doString(String v) { @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class, enableQuickening = true) public abstract static class QuickeningTestError1 extends RootNode implements BytecodeRootNode { - protected QuickeningTestError1(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected QuickeningTestError1(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -275,7 +274,7 @@ public static String doString(String v) { @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class, enableQuickening = true) public abstract static class QuickeningTestError2 extends RootNode implements BytecodeRootNode { - protected QuickeningTestError2(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected QuickeningTestError2(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -299,7 +298,7 @@ public static String otherMethod(String v) { @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class, enableQuickening = true) public abstract static class QuickeningTestError3 extends RootNode implements BytecodeRootNode { - protected QuickeningTestError3(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected QuickeningTestError3(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -321,7 +320,7 @@ public static long doDefault(long v) { @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class, enableQuickening = true) public abstract static class QuickeningTestError4 extends RootNode implements BytecodeRootNode { - protected QuickeningTestError4(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected QuickeningTestError4(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -349,7 +348,7 @@ public static String doString(String v) { @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class, enableQuickening = true) public abstract static class QuickeningTestError5 extends RootNode implements BytecodeRootNode { - protected QuickeningTestError5(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected QuickeningTestError5(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/ReadBytecodeLocationTest.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/ReadBytecodeLocationTest.java index bde9f3de69428..35de5c0e3b860 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/ReadBytecodeLocationTest.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/ReadBytecodeLocationTest.java @@ -45,7 +45,6 @@ import org.junit.Test; -import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.bytecode.BytecodeConfig; import com.oracle.truffle.api.bytecode.BytecodeLocal; import com.oracle.truffle.api.bytecode.BytecodeNode; @@ -250,7 +249,7 @@ public void testStoreOnYield() { @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class, storeBytecodeIndexInFrame = true, enableYield = true) abstract class BytecodeNodeWithStoredBci extends RootNode implements BytecodeRootNode { - protected BytecodeNodeWithStoredBci(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BytecodeNodeWithStoredBci(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/SetTraceFuncTest.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/SetTraceFuncTest.java index 5a86337e2313b..4d98ceb469176 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/SetTraceFuncTest.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/SetTraceFuncTest.java @@ -135,8 +135,7 @@ public abstract static class SetTraceFuncRootNode extends DebugBytecodeRootNode private static final BytecodeConfig TRACE_FUN = SetTraceFuncRootNodeGen.newConfigBuilder().addInstrumentation(TraceFun.class).build(); - protected SetTraceFuncRootNode(TruffleLanguage language, - FrameDescriptor frameDescriptor) { + protected SetTraceFuncRootNode(TraceFunLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/ShortCircuitTest.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/ShortCircuitTest.java index 649035f0d08c1..d4d32cf3c1340 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/ShortCircuitTest.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/ShortCircuitTest.java @@ -50,7 +50,6 @@ import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.bytecode.BytecodeConfig; import com.oracle.truffle.api.bytecode.BytecodeRootNodes; import com.oracle.truffle.api.bytecode.BytecodeParser; @@ -334,7 +333,7 @@ public void testBooleanOr() { @ShortCircuitOperation(name = "BoolAnd", operator = Operator.AND_RETURN_CONVERTED, booleanConverter = BytecodeNodeWithShortCircuit.BooleanConverterNonOperation.class) @ShortCircuitOperation(name = "BoolOr", operator = Operator.OR_RETURN_CONVERTED, booleanConverter = BytecodeNodeWithShortCircuit.BooleanConverterNonOperation.class) abstract class BytecodeNodeWithShortCircuit extends RootNode implements BytecodeRootNode { - protected BytecodeNodeWithShortCircuit(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BytecodeNodeWithShortCircuit(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/StackTraceTest.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/StackTraceTest.java index f2cb636096c82..296938e6f1dee 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/StackTraceTest.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/StackTraceTest.java @@ -63,7 +63,6 @@ import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.CompilerDirectives; -import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.TruffleStackTrace; import com.oracle.truffle.api.TruffleStackTraceElement; import com.oracle.truffle.api.bytecode.BytecodeConfig; @@ -358,8 +357,7 @@ private StackTraceTestRootNode[] chainCalls(int depth, BytecodeParser language, - FrameDescriptor frameDescriptor) { + protected StackTraceTestRootNode(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/TagTest.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/TagTest.java index 47e3f3c0ad198..7f8c44c31f141 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/TagTest.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/TagTest.java @@ -2606,8 +2606,7 @@ static class TestException extends AbstractTruffleException { @OperationProxy(value = ExpressionAdd.class, name = "ImplicitExpressionAddProxy", tags = ExpressionTag.class) public abstract static class TagInstrumentationTestRootNode extends DebugBytecodeRootNode implements BytecodeRootNode { - protected TagInstrumentationTestRootNode(TruffleLanguage language, - FrameDescriptor frameDescriptor) { + protected TagInstrumentationTestRootNode(TagTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -2718,8 +2717,7 @@ public static Object doInt(Object value, boolean shouldThrow, @Bind Node node) { enableSerialization = true, boxingEliminationTypes = {int.class}) public abstract static class TagInstrumentationTestWithPrologAndEpilogRootNode extends DebugBytecodeRootNode implements BytecodeRootNode { - protected TagInstrumentationTestWithPrologAndEpilogRootNode(TruffleLanguage language, - FrameDescriptor frameDescriptor) { + protected TagInstrumentationTestWithPrologAndEpilogRootNode(TagTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -2898,7 +2896,7 @@ protected Object createContext(Env env) { enableTagInstrumentation = true) public abstract static class ErrorNoRootTag extends DebugBytecodeRootNode implements BytecodeRootNode { - protected ErrorNoRootTag(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected ErrorNoRootTag(NoRootTagTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -2917,7 +2915,7 @@ public static boolean doInt(int operand, int value) { enableTagInstrumentation = true, enableRootTagging = false) public abstract static class NoRootTagNoError extends DebugBytecodeRootNode implements BytecodeRootNode { - protected NoRootTagNoError(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected NoRootTagNoError(NoRootTagTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -2951,7 +2949,7 @@ protected Object createContext(Env env) { enableTagInstrumentation = true) public abstract static class ErrorNoRootBodyTag extends DebugBytecodeRootNode implements BytecodeRootNode { - protected ErrorNoRootBodyTag(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected ErrorNoRootBodyTag(NoRootBodyTagTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -2970,7 +2968,7 @@ public static boolean doInt(int operand, int value) { enableTagInstrumentation = true, enableRootBodyTagging = false) public abstract static class NoRootBodyTagNoError extends DebugBytecodeRootNode implements BytecodeRootNode { - protected NoRootBodyTagNoError(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected NoRootBodyTagNoError(NoRootBodyTagTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -2989,7 +2987,7 @@ public static boolean doInt(int operand, int value) { enableTagInstrumentation = false) public abstract static class ErrorImplicitTag1 extends DebugBytecodeRootNode implements BytecodeRootNode { - protected ErrorImplicitTag1(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected ErrorImplicitTag1(NoRootBodyTagTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -3010,7 +3008,7 @@ public static boolean doInt(int operand, int value) { enableTagInstrumentation = true, enableRootTagging = false) public abstract static class ErrorImplicitTag2 extends DebugBytecodeRootNode implements BytecodeRootNode { - protected ErrorImplicitTag2(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected ErrorImplicitTag2(NoRootTagTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -3033,7 +3031,7 @@ public static boolean doInt(int operand, int value) { @OperationProxy(value = ExpressionAdd.class, tags = ExpressionTag.class) public abstract static class ErrorImplicitTag3 extends DebugBytecodeRootNode implements BytecodeRootNode { - protected ErrorImplicitTag3(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected ErrorImplicitTag3(NoRootBodyTagTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -3045,7 +3043,7 @@ protected ErrorImplicitTag3(TruffleLanguage language, FrameDescriptor frameDe @OperationProxy(value = ExpressionAdd.class, tags = StatementTag.class) public abstract static class ErrorImplicitTag4 extends DebugBytecodeRootNode implements BytecodeRootNode { - protected ErrorImplicitTag4(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected ErrorImplicitTag4(NoRootTagTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/TypeSystemTest.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/TypeSystemTest.java index 3e95becc505ed..44a0385c46ca6 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/TypeSystemTest.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/TypeSystemTest.java @@ -46,14 +46,12 @@ import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.bytecode.BytecodeConfig; import com.oracle.truffle.api.bytecode.BytecodeParser; import com.oracle.truffle.api.bytecode.BytecodeRootNode; import com.oracle.truffle.api.bytecode.BytecodeRootNodes; import com.oracle.truffle.api.bytecode.GenerateBytecode; import com.oracle.truffle.api.bytecode.Operation; -import com.oracle.truffle.api.bytecode.test.VariadicTest.TestLanguage; import com.oracle.truffle.api.bytecode.test.error_tests.ExpectError; import com.oracle.truffle.api.dsl.ImplicitCast; import com.oracle.truffle.api.dsl.Specialization; @@ -191,7 +189,7 @@ protected void transferToInterpreterAndInvalidate() { } } - protected TypeSystemTestRootNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected TypeSystemTestRootNode(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -258,24 +256,24 @@ static String castString(String b) { } @GenerateBytecode(// - languageClass = TestLanguage.class) + languageClass = BytecodeDSLTestLanguage.class) @TypeSystemReference(InvalidTypeSystem.class) @SuppressWarnings("unused") @ExpectError("The used type system is invalid. Fix errors in the type system first.") abstract static class InvalidTypeSystemRootNode1 extends RootNode implements BytecodeRootNode { - protected InvalidTypeSystemRootNode1(TruffleLanguage language, FrameDescriptor d) { + protected InvalidTypeSystemRootNode1(BytecodeDSLTestLanguage language, FrameDescriptor d) { super(language, d); } } @GenerateBytecode(// - languageClass = TestLanguage.class) + languageClass = BytecodeDSLTestLanguage.class) @SuppressWarnings("unused") abstract static class InvalidTypeSystemRootNode2 extends RootNode implements BytecodeRootNode { - protected InvalidTypeSystemRootNode2(TruffleLanguage language, FrameDescriptor d) { + protected InvalidTypeSystemRootNode2(BytecodeDSLTestLanguage language, FrameDescriptor d) { super(language, d); } @@ -295,7 +293,7 @@ public static String operate(String value) { @TypeSystemReference(TypeSystemTestTypeSystem.class) abstract static class SameTypeSystemRootNode extends RootNode implements BytecodeRootNode { - protected SameTypeSystemRootNode(TruffleLanguage language, FrameDescriptor d) { + protected SameTypeSystemRootNode(BytecodeDSLTestLanguage language, FrameDescriptor d) { super(language, d); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/VariadicTest.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/VariadicTest.java index 02d4bce356110..ff5b53ff6077a 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/VariadicTest.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/VariadicTest.java @@ -130,7 +130,7 @@ protected Env createContext(Env env) { @GenerateBytecode(boxingEliminationTypes = {long.class}, languageClass = TestLanguage.class, enableYield = true, enableSerialization = true) public abstract static class VariadicOperationsNode extends RootNode implements BytecodeRootNode { - protected VariadicOperationsNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected VariadicOperationsNode(TestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/basic_interpreter/BasicInterpreter.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/basic_interpreter/BasicInterpreter.java index 3c5ab8c1423ee..0b39956a173ca 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/basic_interpreter/BasicInterpreter.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/basic_interpreter/BasicInterpreter.java @@ -48,7 +48,6 @@ import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.Truffle; -import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.bytecode.BytecodeConfig; import com.oracle.truffle.api.bytecode.BytecodeLocation; import com.oracle.truffle.api.bytecode.BytecodeNode; @@ -149,7 +148,7 @@ @ShortCircuitOperation(booleanConverter = BasicInterpreter.ToBoolean.class, name = "ScOr", operator = Operator.OR_RETURN_VALUE, javadoc = "ScOr returns the first truthy operand value.") public abstract class BasicInterpreter extends DebugBytecodeRootNode implements BytecodeRootNode { - protected BasicInterpreter(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BasicInterpreter(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/error_tests/ErrorTests.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/error_tests/ErrorTests.java index 3a090e43db155..c776953045497 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/error_tests/ErrorTests.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/error_tests/ErrorTests.java @@ -85,7 +85,7 @@ public class ErrorTests { @ExpectError("Bytecode DSL class must be declared abstract.") @GenerateBytecode(languageClass = ErrorLanguage.class) public static class MustBeDeclaredAbstract extends RootNode implements BytecodeRootNode { - protected MustBeDeclaredAbstract(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected MustBeDeclaredAbstract(ErrorLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -110,14 +110,14 @@ public InstrumentableNode materializeInstrumentTree(Set> ma @ExpectError("Bytecode DSL class must directly or indirectly subclass RootNode.") @GenerateBytecode(languageClass = ErrorLanguage.class) public abstract static class MustBeSubclassOfRootNode implements BytecodeRootNode { - protected MustBeSubclassOfRootNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected MustBeSubclassOfRootNode(ErrorLanguage language, FrameDescriptor frameDescriptor) { } } @ExpectError("Bytecode DSL class must directly or indirectly implement BytecodeRootNode.") @GenerateBytecode(languageClass = ErrorLanguage.class) public abstract static class MustImplementBytecodeRootNode extends RootNode { - protected MustImplementBytecodeRootNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected MustImplementBytecodeRootNode(ErrorLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } } @@ -125,7 +125,7 @@ protected MustImplementBytecodeRootNode(TruffleLanguage language, FrameDescri @ExpectError("Bytecode DSL class must be public or package-private.") @GenerateBytecode(languageClass = ErrorLanguage.class) private abstract static class MustBePublic extends RootNode implements BytecodeRootNode { - protected MustBePublic(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected MustBePublic(ErrorLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } } @@ -133,7 +133,7 @@ protected MustBePublic(TruffleLanguage language, FrameDescriptor frameDescrip @ExpectError("Bytecode DSL class must be static if it is a nested class.") @GenerateBytecode(languageClass = ErrorLanguage.class) public abstract class MustBeStatic extends RootNode implements BytecodeRootNode { - protected MustBeStatic(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected MustBeStatic(ErrorLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } } @@ -150,12 +150,12 @@ protected MustBeStatic(TruffleLanguage language, FrameDescriptor frameDescrip @GenerateAOT @GenerateInline public abstract static class BadAnnotations extends RootNode implements BytecodeRootNode { - protected BadAnnotations(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BadAnnotations(ErrorLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } } - @ExpectError("Bytecode DSL class should declare a constructor that has signature (TruffleLanguage, FrameDescriptor) or (TruffleLanguage, FrameDescriptor.Builder). The constructor should be visible to subclasses.") + @ExpectError("Bytecode DSL class should declare a constructor that has signature (ErrorLanguage, FrameDescriptor) or (ErrorLanguage, FrameDescriptor.Builder). The constructor should be visible to subclasses.") @GenerateBytecode(languageClass = ErrorLanguage.class) public abstract static class HiddenConstructor extends RootNode implements BytecodeRootNode { private HiddenConstructor(TruffleLanguage language, FrameDescriptor descriptor) { @@ -163,7 +163,7 @@ private HiddenConstructor(TruffleLanguage language, FrameDescriptor descripto } } - @ExpectError("Bytecode DSL class should declare a constructor that has signature (TruffleLanguage, FrameDescriptor) or (TruffleLanguage, FrameDescriptor.Builder). The constructor should be visible to subclasses.") + @ExpectError("Bytecode DSL class should declare a constructor that has signature (ErrorLanguage, FrameDescriptor) or (ErrorLanguage, FrameDescriptor.Builder). The constructor should be visible to subclasses.") @GenerateBytecode(languageClass = ErrorLanguage.class) public abstract static class InvalidConstructor extends RootNode implements BytecodeRootNode { protected InvalidConstructor() { @@ -174,11 +174,11 @@ protected InvalidConstructor(String name) { super(null); } - protected InvalidConstructor(TruffleLanguage language) { + protected InvalidConstructor(ErrorLanguage language) { super(language); } - protected InvalidConstructor(TruffleLanguage language, String name) { + protected InvalidConstructor(ErrorLanguage language, String name) { super(language); } @@ -193,7 +193,7 @@ protected InvalidConstructor(FrameDescriptor.Builder builder, TruffleLanguage @GenerateBytecode(languageClass = ErrorLanguage.class) public abstract static class BadOverrides extends RootNode implements BytecodeRootNode { - protected BadOverrides(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BadOverrides(ErrorLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -241,7 +241,7 @@ public final BytecodeRootNodes getRootNodes() { */ @GenerateBytecode(languageClass = ErrorLanguage.class, enableTagInstrumentation = true) public abstract static class AcceptableOverrides extends RootNodeWithMoreOverrides implements BytecodeRootNode { - protected AcceptableOverrides(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected AcceptableOverrides(ErrorLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -265,7 +265,7 @@ public boolean isCaptureFramesForTrace(boolean compiledFrame) { } private abstract static class RootNodeWithOverrides extends RootNode { - protected RootNodeWithOverrides(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected RootNodeWithOverrides(ErrorLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -281,7 +281,7 @@ public boolean isInstrumentable() { } private abstract static class RootNodeWithMoreOverrides extends RootNodeWithOverrides { - protected RootNodeWithMoreOverrides(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected RootNodeWithMoreOverrides(ErrorLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -301,7 +301,7 @@ public void prepareForInstrumentation(Set> tags) { @GenerateBytecode(languageClass = ErrorLanguage.class) @TypeSystemReference(ErroredTypeSystem.class) public abstract static class BadTypeSystem extends RootNode implements BytecodeRootNode { - protected BadTypeSystem(TruffleLanguage language, FrameDescriptor builder) { + protected BadTypeSystem(ErrorLanguage language, FrameDescriptor builder) { super(language, builder); } } @@ -309,7 +309,7 @@ protected BadTypeSystem(TruffleLanguage language, FrameDescriptor builder) { @ExpectError("Cannot perform boxing elimination on java.lang.String. Remove this type from the boxing eliminated types list. Only primitive types boolean, byte, int, float, long, and double are supported.") @GenerateBytecode(languageClass = ErrorLanguage.class, boxingEliminationTypes = {String.class}) public abstract static class BadBoxingElimination extends RootNode implements BytecodeRootNode { - protected BadBoxingElimination(TruffleLanguage language, FrameDescriptor builder) { + protected BadBoxingElimination(ErrorLanguage language, FrameDescriptor builder) { super(language, builder); } } @@ -318,7 +318,7 @@ protected BadBoxingElimination(TruffleLanguage language, FrameDescriptor buil @GenerateBytecode(languageClass = ErrorLanguage.class) @OperationProxy(int.class) public abstract static class PrimitiveProxyType extends RootNode implements BytecodeRootNode { - protected PrimitiveProxyType(TruffleLanguage language, FrameDescriptor builder) { + protected PrimitiveProxyType(ErrorLanguage language, FrameDescriptor builder) { super(language, builder); } } @@ -327,7 +327,7 @@ protected PrimitiveProxyType(TruffleLanguage language, FrameDescriptor builde @ExpectError("Encountered errors using com.oracle.truffle.api.bytecode.test.error_tests.ErrorTests.NoCachedProxyType.NodeWithNoCache as an OperationProxy. These errors must be resolved before the DSL can proceed.") @OperationProxy(NoCachedProxyType.NodeWithNoCache.class) public abstract static class NoCachedProxyType extends RootNode implements BytecodeRootNode { - protected NoCachedProxyType(TruffleLanguage language, FrameDescriptor builder) { + protected NoCachedProxyType(ErrorLanguage language, FrameDescriptor builder) { super(language, builder); } @@ -364,7 +364,7 @@ public static int doInt() { @OperationProxy(Underscored_Operation_Proxy.class) @OperationProxy(UnproxyableOperationProxy.class) public abstract static class OperationErrorTests extends RootNode implements BytecodeRootNode { - protected OperationErrorTests(TruffleLanguage language, FrameDescriptor builder) { + protected OperationErrorTests(ErrorLanguage language, FrameDescriptor builder) { super(language, builder); } @@ -491,7 +491,7 @@ public static void doExecute() { @OperationProxy(NestedNodeOperationProxy.class) public abstract static class BadSpecializationOrDSLTests extends RootNode implements BytecodeRootNode { - protected BadSpecializationOrDSLTests(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected BadSpecializationOrDSLTests(ErrorLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -509,8 +509,10 @@ public boolean guardCondition() { } // These should not cause an issue because they are in the same package as the generated - // root node would be. The generated node can see them. There are similar versions of these - // nodes defined in a separate package (e.g., {@link NonPublicSpecializationOperationProxy}) + // root node would be. The generated node can see them. There are similar versions of + // these + // nodes defined in a separate package (e.g., {@link + // NonPublicSpecializationOperationProxy}) // which are not visible and should cause issues. @Operation public static final class PackagePrivateSpecializationOperation { @@ -629,7 +631,7 @@ static int add(int x, int y) { "the class must be annotated with @OperationProxy.Proxyable(allowUncached=true) when an uncached interpreter is requested.") @OperationProxy(NoUncachedOperationProxy.class) public abstract static class OperationErrorUncachedTests extends RootNode implements BytecodeRootNode { - protected OperationErrorUncachedTests(TruffleLanguage language, FrameDescriptor builder) { + protected OperationErrorUncachedTests(ErrorLanguage language, FrameDescriptor builder) { super(language, builder); } } @@ -655,7 +657,7 @@ static int add(int x, int y) { @OperationProxy(value = AddOperation.class, name = "MyOperation") @OperationProxy(value = SubOperation.class, name = "MyOperation") public abstract static class DuplicateOperationNameTest extends RootNode implements BytecodeRootNode { - protected DuplicateOperationNameTest(TruffleLanguage language, FrameDescriptor builder) { + protected DuplicateOperationNameTest(ErrorLanguage language, FrameDescriptor builder) { super(language, builder); } } @@ -679,7 +681,7 @@ static int sub(int x, int y) { @GenerateBytecode(languageClass = ErrorLanguage.class) @ExpectError({"At least one operation must be declared using @Operation, @OperationProxy, or @ShortCircuitOperation."}) public abstract static class NoOperationsTest extends RootNode implements BytecodeRootNode { - protected NoOperationsTest(TruffleLanguage language, FrameDescriptor builder) { + protected NoOperationsTest(ErrorLanguage language, FrameDescriptor builder) { super(language, builder); } } @@ -692,7 +694,7 @@ protected NoOperationsTest(TruffleLanguage language, FrameDescriptor builder) @ShortCircuitOperation(name = "Foo", operator = Operator.AND_RETURN_VALUE, booleanConverter = BadBooleanConverterTest.ToBooleanBadReturn.class) @ShortCircuitOperation(name = "Bar", operator = Operator.AND_RETURN_VALUE, booleanConverter = BadBooleanConverterTest.ToBooleanBadOperation.class) public abstract static class BadBooleanConverterTest extends RootNode implements BytecodeRootNode { - protected BadBooleanConverterTest(TruffleLanguage language, FrameDescriptor builder) { + protected BadBooleanConverterTest(ErrorLanguage language, FrameDescriptor builder) { super(language, builder); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/error_tests/TestVariantErrorTest.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/error_tests/TestVariantErrorTest.java index 34cb74cc48018..1a8c22715b26c 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/error_tests/TestVariantErrorTest.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/error_tests/TestVariantErrorTest.java @@ -59,7 +59,7 @@ public class TestVariantErrorTest { @Variant(suffix = "A", configuration = @GenerateBytecode(languageClass = ErrorLanguage.class))}) @OperationProxy(ConstantOperation.class) public abstract static class SameName extends RootNode implements BytecodeRootNode { - protected SameName(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected SameName(ErrorLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } } @@ -71,7 +71,7 @@ protected SameName(TruffleLanguage language, FrameDescriptor frameDescriptor) }) @OperationProxy(ConstantOperation.class) public abstract static class DifferentLanguage extends RootNode implements BytecodeRootNode { - protected DifferentLanguage(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected DifferentLanguage(ErrorLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } } @@ -83,7 +83,7 @@ protected DifferentLanguage(TruffleLanguage language, FrameDescriptor frameDe }) @OperationProxy(ConstantOperation.class) public abstract static class DifferentYield extends RootNode implements BytecodeRootNode { - protected DifferentYield(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected DifferentYield(ErrorLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } } @@ -95,7 +95,7 @@ protected DifferentYield(TruffleLanguage language, FrameDescriptor frameDescr }) @OperationProxy(ConstantOperation.class) public abstract static class DifferentUncachedInterpreters extends RootNode implements BytecodeRootNode { - protected DifferentUncachedInterpreters(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected DifferentUncachedInterpreters(ErrorLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/BuiltinTutorial.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/BuiltinTutorial.java index 7e425554842e9..4c1c60d45054a 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/BuiltinTutorial.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/BuiltinTutorial.java @@ -137,7 +137,7 @@ abstract static sealed class AbstractBuiltin permits JavaBuiltin, BuilderBuiltin @GenerateBytecode(languageClass = LanguageWithBuiltins.class, enableUncachedInterpreter = true, enableSerialization = true) public abstract static class BuiltinLanguageRootNode extends DebugBytecodeRootNode implements BytecodeRootNode { - protected BuiltinLanguageRootNode(TruffleLanguage language, + protected BuiltinLanguageRootNode(LanguageWithBuiltins language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/ContinuationsTutorial.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/ContinuationsTutorial.java index f407d121cc3d2..db6afa3ab0c85 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/ContinuationsTutorial.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/ContinuationsTutorial.java @@ -45,7 +45,6 @@ import org.junit.Test; -import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.bytecode.BytecodeConfig; import com.oracle.truffle.api.bytecode.BytecodeLocal; import com.oracle.truffle.api.bytecode.BytecodeLocation; @@ -83,7 +82,7 @@ public class ContinuationsTutorial { */ @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class, enableYield = true) public abstract static class YieldingBytecodeNode extends RootNode implements BytecodeRootNode { - protected YieldingBytecodeNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected YieldingBytecodeNode(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } @@ -263,7 +262,7 @@ public void testContinuationWithState() { */ @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class, enableYield = true, enableSpecializationIntrospection = true) public abstract static class YieldingBytecodeNodeWithResume extends RootNode implements BytecodeRootNode { - protected YieldingBytecodeNodeWithResume(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected YieldingBytecodeNodeWithResume(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/GettingStarted.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/GettingStarted.java index a4115f93d0f2f..2d119de3c74ae 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/GettingStarted.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/GettingStarted.java @@ -97,7 +97,7 @@ public abstract static class GettingStartedBytecodeRootNode extends RootNode imp * {@link TruffleLanguage} and a {@link FrameDescriptor} (or * {@link FrameDescriptor.Builder}). */ - protected GettingStartedBytecodeRootNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected GettingStartedBytecodeRootNode(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/Introduction.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/Introduction.java index 1b59b1e618f89..2d6e48248934f 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/Introduction.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/Introduction.java @@ -45,7 +45,6 @@ import org.junit.Test; import com.oracle.truffle.api.RootCallTarget; -import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.bytecode.BytecodeConfig; import com.oracle.truffle.api.bytecode.BytecodeParser; import com.oracle.truffle.api.bytecode.BytecodeRootNode; @@ -70,7 +69,7 @@ public class Introduction { @GenerateBytecode(languageClass = BytecodeDSLTestLanguage.class) public abstract static class SampleInterpreter extends RootNode implements BytecodeRootNode { - protected SampleInterpreter(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected SampleInterpreter(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/SerializationTutorial.java b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/SerializationTutorial.java index e64be4f5e29b3..19e5107c22930 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/SerializationTutorial.java +++ b/truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/examples/SerializationTutorial.java @@ -110,7 +110,7 @@ public abstract static class SerializableBytecodeNode extends RootNode implement protected String name = null; // will be serialized protected transient String transientField = null; // will not be serialized - protected SerializableBytecodeNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { + protected SerializableBytecodeNode(BytecodeDSLTestLanguage language, FrameDescriptor frameDescriptor) { super(language, frameDescriptor); } diff --git a/truffle/src/com.oracle.truffle.api.bytecode/src/com/oracle/truffle/api/bytecode/BytecodeNode.java b/truffle/src/com.oracle.truffle.api.bytecode/src/com/oracle/truffle/api/bytecode/BytecodeNode.java index e625bb3be91c6..e34a319d3f333 100644 --- a/truffle/src/com.oracle.truffle.api.bytecode/src/com/oracle/truffle/api/bytecode/BytecodeNode.java +++ b/truffle/src/com.oracle.truffle.api.bytecode/src/com/oracle/truffle/api/bytecode/BytecodeNode.java @@ -215,7 +215,8 @@ public final SourceSection[] getSourceLocations(Frame frame, Node location) { /** * Finds the most concrete source location associated with the given bytecode index. The method * returns null if no source section could be found. Calling this method also - * {@link BytecodeRootNodes#ensureSourceInformation() ensures source sections} are materialized. * + * {@link BytecodeRootNodes#ensureSourceInformation() ensures source sections} are materialized. + * * *

* If source sections have not yet been materialized, then null is returned. Source * sections may be materialized by calling {@link #ensureSourceInformation()}. diff --git a/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/bytecode/parser/BytecodeDSLParser.java b/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/bytecode/parser/BytecodeDSLParser.java index 02199ebd0ab8f..cd1a8eb3330f9 100644 --- a/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/bytecode/parser/BytecodeDSLParser.java +++ b/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/bytecode/parser/BytecodeDSLParser.java @@ -261,7 +261,7 @@ private void parseBytecodeDSLModel(TypeElement typeElement, BytecodeDSLModel mod // not the right number of params return false; } - if (!ElementUtils.isAssignable(params.get(0).asType(), types.TruffleLanguage)) { + if (!ElementUtils.typeEquals(params.get(0).asType(), model.languageClass)) { // wrong first parameter type return false; } @@ -274,9 +274,9 @@ private void parseBytecodeDSLModel(TypeElement typeElement, BytecodeDSLModel mod if (viableConstructors.isEmpty()) { model.addError(typeElement, "Bytecode DSL class should declare a constructor that has signature (%s, %s) or (%s, %s.%s). The constructor should be visible to subclasses.", - getSimpleName(types.TruffleLanguage), + getSimpleName(model.languageClass), getSimpleName(types.FrameDescriptor), - getSimpleName(types.TruffleLanguage), + getSimpleName(model.languageClass), getSimpleName(types.FrameDescriptor), getSimpleName(types.FrameDescriptor_Builder)); return; diff --git a/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/bytecode/SLBytecodeRootNode.java b/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/bytecode/SLBytecodeRootNode.java index 2a46cdc24ad48..debe7d59155ee 100644 --- a/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/bytecode/SLBytecodeRootNode.java +++ b/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/bytecode/SLBytecodeRootNode.java @@ -43,7 +43,6 @@ import com.oracle.truffle.api.Assumption; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.RootCallTarget; -import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.TruffleStackTraceElement; import com.oracle.truffle.api.bytecode.BytecodeNode; import com.oracle.truffle.api.bytecode.BytecodeRootNode; @@ -129,8 +128,8 @@ @ShortCircuitOperation(name = "SLOr", booleanConverter = SLToBooleanNode.class, operator = Operator.OR_RETURN_CONVERTED) public abstract class SLBytecodeRootNode extends SLRootNode implements BytecodeRootNode { - protected SLBytecodeRootNode(TruffleLanguage language, FrameDescriptor frameDescriptor) { - super((SLLanguage) language, frameDescriptor); + protected SLBytecodeRootNode(SLLanguage language, FrameDescriptor frameDescriptor) { + super(language, frameDescriptor); } protected TruffleString tsName;