Skip to content

Commit 745b41f

Browse files
committed
[GR-71817] Use FrameWithoutBoxing directly in the bytecode DSL.
PullRequest: graal/22776
2 parents 8188825 + 153e277 commit 745b41f

File tree

3 files changed

+54
-51
lines changed

3 files changed

+54
-51
lines changed

truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/TruffleTypes.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,10 @@ public class TruffleTypes {
246246
public final DeclaredType VirtualFrame = c.getDeclaredType(VirtualFrame_Name);
247247
public final DeclaredType HostLanguage = c.getDeclaredTypeOptional(HostLanguage_Name);
248248

249+
// impl
250+
public static final String FrameWithoutBoxing_Name = "com.oracle.truffle.api.impl.FrameWithoutBoxing";
251+
public final DeclaredType FrameWithoutBoxing = c.getDeclaredType(FrameWithoutBoxing_Name);
252+
249253
// DSL API
250254
public static final String Bind_Name = "com.oracle.truffle.api.dsl.Bind";
251255
public static final String Bind_DefaultExpression_Name = "com.oracle.truffle.api.dsl.Bind.DefaultExpression";

truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/bytecode/generator/BytecodeDSLNodeGeneratorPlugs.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void setInstruction(InstructionModel instr) {
110110
public List<? extends VariableElement> additionalArguments() {
111111
List<CodeVariableElement> result = new ArrayList<>();
112112
if (model.hasYieldOperation()) {
113-
result.add(new CodeVariableElement(context.getTypes().VirtualFrame, "$stackFrame"));
113+
result.add(new CodeVariableElement(context.getTypes().FrameWithoutBoxing, "$stackFrame"));
114114
}
115115
result.add(new CodeVariableElement(nodeType, "$bytecode"));
116116
result.add(new CodeVariableElement(context.getType(byte[].class), "$bc"));

0 commit comments

Comments
 (0)