Skip to content

Commit 81472e8

Browse files
committed
Recommend @Bind Node node in Truffle DSL error messages
1 parent 9be24ba commit 81472e8

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

truffle/docs/DSLNodeObjectInlining.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ For example:
428428
/* ... */
429429

430430
@ExportMessage
431-
final long abs(@Bind("$node") Node node,
431+
final long abs(@Bind Node node,
432432
@Cached InlinedConditionProfile profile) {
433433
if (profile.profile(node, this.value >= 0)) {
434434
return this.value;

truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/GenerateInlineTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1745,7 +1745,7 @@ public abstract static class ErrorMultiInstanceInliningNeedsNode extends Node {
17451745

17461746
abstract Object execute(Object arg);
17471747

1748-
@ExpectError("For this specialization with inlined cache parameters a '@Bind(\"this\") Node node' parameter must be declared. %")
1748+
@ExpectError("For this specialization with inlined cache parameters a '@Bind Node node' parameter must be declared. %")
17491749
@Specialization(guards = "arg == cachedArg", limit = "3")
17501750
static Object doInt(int arg,
17511751
@Cached(inline = true) SimpleNode simpleNode,
@@ -2327,7 +2327,7 @@ final boolean isPointer() {
23272327
return false;
23282328
}
23292329

2330-
@ExpectError("For this specialization with inlined cache parameters a '@Bind(\"$node\") Node node' parameter must be declared.%")
2330+
@ExpectError("For this specialization with inlined cache parameters a '@Bind Node node' parameter must be declared.%")
23312331
@ExportMessage
23322332
long asPointer(@Cached InlinedBranchProfile profile) {
23332333
return 0L;
@@ -2346,7 +2346,7 @@ final boolean isPointer() {
23462346

23472347
@ExportMessage
23482348
static class AsPointer {
2349-
@ExpectError("For this specialization with inlined cache parameters a '@Bind(\"$node\") Node node' parameter must be declared.%")
2349+
@ExpectError("For this specialization with inlined cache parameters a '@Bind Node node' parameter must be declared.%")
23502350
@Specialization
23512351
static long asPointer(ErrorUseBindParamterInLibraryExport2 receiver, @Cached InlinedBranchProfile profile) {
23522352
return 0L;

truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeParser.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -709,13 +709,7 @@ private void verifyRecommendationWarnings(NodeData node, boolean recommendInline
709709
}
710710

711711
if (!hasNodeParameter) {
712-
String nodeParameter;
713-
if (mode == ParseMode.EXPORTED_MESSAGE) {
714-
nodeParameter = String.format("@%s(\"$node\") Node node", getSimpleName(types.Bind));
715-
} else {
716-
nodeParameter = String.format("@%s(\"this\") Node node", getSimpleName(types.Bind));
717-
}
718-
712+
String nodeParameter = String.format("@%s Node node", getSimpleName(types.Bind));
719713
String message = String.format(
720714
"For this specialization with inlined cache parameters a '%s' parameter must be declared. " + //
721715
"This parameter must be passed along to inlined cached values. " +

0 commit comments

Comments
 (0)