Skip to content

Commit 680631a

Browse files
committed
Fix reviewer comments.
1 parent 5d61be2 commit 680631a

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

truffle/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This changelog summarizes major changes between Truffle versions relevant to lan
77
* GR-61493 Added `RootNode.prepareForCall` which allows root nodes to prepare themselves for use as a call target (or to validate whether they can be used as a call target).
88
* GR-57063 Bytecode-DSL: Improved variadic support. Variadic operands compile and execute now more efficiently with fewer reallocations.
99
* GR-57063 Bytecode-DSL: Added an `startOffset` parameter to `@Variadic` which allows to reserve a fixed number of slots in the object array for custom use.
10-
* GR-57063 Bytecode-DSL: The `@Variadic` annotation can now also be used on `@Operation` annotated classes to indicate a dynamic variadic return values. Dynamic variadic return values are efficiently flattened into the object array of a variadic operand.
10+
* GR-57063 Bytecode-DSL: The `@Variadic` annotation can now also be used on `@Operation` annotated classes to indicate that the operation produces a dynamic variadic return value. Dynamic variadic return values are efficiently flattened into the object array of a variadic operand.
1111
* GR-57063 Bytecode-DSL: Added a `variadicStackLimit` parameter to `@GenerateBytecode` that allows to specify how many variable arguments are stored on the stack before they are collapsed into an object array.
1212

1313
## Version 24.2.0

truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/error_tests/ErrorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1028,7 +1028,7 @@ protected InvalidVarargsReturnTest3(ErrorLanguage language, FrameDescriptor buil
10281028
super(language, builder);
10291029
}
10301030

1031-
@ExpectError("@Variadic.startOffset is not supported for variadic return specifications. It supported for variadic operands only.")
1031+
@ExpectError("@Variadic.startOffset is not supported for variadic return specifications. It is supported for variadic operands only.")
10321032
@Variadic(startOffset = 0)
10331033
@Operation
10341034
public static final class VariadicsReturn {

truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/bytecode/model/BytecodeDSLModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public BytecodeDSLModel(ProcessorContext context, TypeElement templateType, Anno
201201
public int maximumVariadicOffset;
202202

203203
/**
204-
* Whether any instruction has a variadic return. {@link #hasCustomReturn} implies
204+
* Whether any instruction has a variadic return. {@link #hasVariadicReturn} implies
205205
* {@link #hasCustomVariadic}.
206206
*/
207207
public boolean hasVariadicReturn;

truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/bytecode/parser/CustomOperationParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ CustomOperationModel parseCustomRegularOperation(AnnotationMirror mirror, TypeEl
281281
Integer startOffset = ElementUtils.getAnnotationValue(Integer.class, variadicReturn, "startOffset", false);
282282
if (startOffset != null) {
283283
customOperation.addError(variadicReturn, ElementUtils.getAnnotationValue(variadicReturn, "startOffset"),
284-
"@%s.startOffset is not supported for variadic return specifications. It supported for variadic operands only.",
284+
"@%s.startOffset is not supported for variadic return specifications. It is supported for variadic operands only.",
285285
getSimpleName(types.Variadic));
286286
}
287287
if (!ElementUtils.typeEquals(signature.returnType, context.getType(Object[].class))) {

0 commit comments

Comments
 (0)