encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-07-12 08:05:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolver: Validate that parameter names are unique

Browse Source 
Fixed: chromium:1242330
Change-Id: I7a5c32f55b5a4d5898c1fe4efeee084dfeb15346
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/62444
Auto-Submit: Ben Clayton <bclayton@google.com>
Commit-Queue: James Price <jrprice@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: James Price <jrprice@google.com>
This commit is contained in:
Ben Clayton 2021-08-23 19:01:19 +00:00 committed by Tint LUCI CQ
parent 367f5df5c3
commit 6d60c046e8
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/resolver/function_validation_test.cc
View File

@ -28,13 +28,13 @@ class ResolverFunctionValidationTest : public resolver::TestHelper,
TEST_F(ResolverFunctionValidationTest, FunctionNamesMustBeUnique_fail) { TEST_F(ResolverFunctionValidationTest, FunctionNamesMustBeUnique_fail) {
// fn func -> i32 { return 2; } // fn func -> i32 { return 2; }
// fn func -> i32 { return 2; } // fn func -> i32 { return 2; }
Func("func", ast::VariableList{}, ty.i32(), Func(Source{{56, 78}}, "func", ast::VariableList{}, ty.i32(),
ast::StatementList{ ast::StatementList{
Return(2), Return(2),
}, },
ast::DecorationList{}); ast::DecorationList{});
Func(Source{Source::Location{12, 34}}, "func", ast::VariableList{}, ty.i32(), Func(Source{{12, 34}}, "func", ast::VariableList{}, ty.i32(),
ast::StatementList{ ast::StatementList{
Return(2), Return(2),
}, },
@ -42,8 +42,34 @@ TEST_F(ResolverFunctionValidationTest, FunctionNamesMustBeUnique_fail) {
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 error: redefinition of 'func'\nnote: previous definition " R"(12:34 error: redefinition of 'func'
"is here"); 56:78 note: previous definition is here)");
}
TEST_F(ResolverFunctionValidationTest, ParameterNamesMustBeUnique_fail) {
// fn func(common_name : f32, x : i32, common_name : u32) { }
Func("func",
{
Param(Source{{56, 78}}, "common_name", ty.f32()),
Param("x", ty.i32()),
Param(Source{{12, 34}}, "common_name", ty.u32()),
},
ty.void_(), {});
EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(),
R"(12:34 error: redefinition of 'common_name'
56:78 note: previous definition is here)");
}
TEST_F(ResolverFunctionValidationTest, ParameterNamesMustBeUnique_pass) {
// fn func_a(common_name : f32) { }
// fn func_b(common_name : f32) { }
Func("func_a", {Param("common_name", ty.f32())}, ty.void_(), {});
Func("func_b", {Param("common_name", ty.f32())}, ty.void_(), {});
EXPECT_TRUE(r()->Resolve());
EXPECT_EQ(r()->error(), "");
} }
TEST_F(ResolverFunctionValidationTest, TEST_F(ResolverFunctionValidationTest,

5
src/resolver/resolver.cc
View File

@ -1698,6 +1698,11 @@ bool Resolver::Function(ast::Function* func) {
uint32_t parameter_index = 0; uint32_t parameter_index = 0;
for (auto* param : func->params()) { for (auto* param : func->params()) {
Mark(param); Mark(param);
if (!ValidateNoDuplicateDefinition(param->symbol(), param->source())) {
return false;
}
auto* param_info = auto* param_info =
Variable(param, VariableKind::kParameter, parameter_index++); Variable(param, VariableKind::kParameter, parameter_index++);
if (!param_info) { if (!param_info) {