[tint] Avoid using function source in diagnostics
The function source is the entire function (including body), which
prints far more that is useful for most errors. Use something more
specific for these validation errors (such as the function name, or
return type).
Change-Id: I980146508b80a1b0b33a7ddb685252f3d33702c0
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/187381
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: James Price <jrprice@google.com>
diff --git a/src/tint/lang/wgsl/resolver/function_validation_test.cc b/src/tint/lang/wgsl/resolver/function_validation_test.cc
index 764af82..0abe53b 100644
--- a/src/tint/lang/wgsl/resolver/function_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/function_validation_test.cc
@@ -255,12 +255,12 @@
auto* var = Var("a", ty.i32(), Expr(2_i));
Func(Source{{12, 34}}, "func", tint::Empty, ty.i32(),
- Vector{
- Decl(var),
- });
+ Block(Source{Source::Range{{45, 56}, {78, 90}}}, Vector{
+ Decl(var),
+ }));
EXPECT_FALSE(r()->Resolve());
- EXPECT_EQ(r()->error(), R"(12:34 error: missing return at end of function)");
+ EXPECT_EQ(r()->error(), R"(78:89 error: missing return at end of function)");
}
TEST_F(ResolverFunctionValidationTest, VoidFunctionEndWithoutReturnStatementEmptyBody_Pass) {
@@ -274,10 +274,11 @@
TEST_F(ResolverFunctionValidationTest, FunctionEndWithoutReturnStatementEmptyBody_Fail) {
// fn func() -> int {}
- Func(Source{{12, 34}}, "func", tint::Empty, ty.i32(), tint::Empty);
+ Func(Source{{12, 34}}, "func", tint::Empty, ty.i32(),
+ Block(Source{Source::Range{{45, 56}, {78, 90}}}, tint::Empty));
EXPECT_FALSE(r()->Resolve());
- EXPECT_EQ(r()->error(), R"(12:34 error: missing return at end of function)");
+ EXPECT_EQ(r()->error(), R"(78:89 error: missing return at end of function)");
}
TEST_F(ResolverFunctionValidationTest, FunctionTypeMustMatchReturnStatementType_Pass) {
@@ -1022,7 +1023,7 @@
for (int i = 0; i < 256; i++) {
params.Push(Param("param_" + std::to_string(i), ty.i32()));
}
- Func(Source{{12, 34}}, "f", params, ty.void_(), tint::Empty);
+ Func(Ident(Source{{12, 34}}, "f"), params, ty.void_(), tint::Empty);
EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), R"(12:34 error: function declares 256 parameters, maximum is 255)");
diff --git a/src/tint/lang/wgsl/resolver/resolver.cc b/src/tint/lang/wgsl/resolver/resolver.cc
index daf8c12..fad6159 100644
--- a/src/tint/lang/wgsl/resolver/resolver.cc
+++ b/src/tint/lang/wgsl/resolver/resolver.cc
@@ -1156,9 +1156,10 @@
}
if (auto* str = return_type->As<core::type::Struct>()) {
- if (!ApplyAddressSpaceUsageToType(core::AddressSpace::kUndefined, str, decl->source)) {
- AddNote(decl->source) << "while instantiating return type for "
- << decl->name->symbol.NameView();
+ if (!ApplyAddressSpaceUsageToType(core::AddressSpace::kUndefined, str,
+ decl->return_type->source)) {
+ AddNote(decl->return_type->source)
+ << "while instantiating return type for " << decl->name->symbol.NameView();
return nullptr;
}
diff --git a/src/tint/lang/wgsl/resolver/validator.cc b/src/tint/lang/wgsl/resolver/validator.cc
index 7695424..7963482 100644
--- a/src/tint/lang/wgsl/resolver/validator.cc
+++ b/src/tint/lang/wgsl/resolver/validator.cc
@@ -1096,8 +1096,8 @@
}
if (decl->params.Length() > kMaxFunctionParameters) {
- AddError(decl->source) << "function declares " << decl->params.Length()
- << " parameters, maximum is " << kMaxFunctionParameters;
+ AddError(decl->name->source) << "function declares " << decl->params.Length()
+ << " parameters, maximum is " << kMaxFunctionParameters;
return false;
}
@@ -1114,7 +1114,9 @@
behaviors = sem_.Get(last)->Behaviors();
}
if (behaviors.Contains(sem::Behavior::kNext)) {
- AddError(decl->source) << "missing return at end of function";
+ auto end_source = decl->body->source.End();
+ end_source.range.begin.column--;
+ AddError(end_source) << "missing return at end of function";
return false;
}
} else if (TINT_UNLIKELY(IsValidationEnabled(
