encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-06-25 16:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Validator regression reporting param not declared

Browse Source 
This regression was accidentally introduced by my CL:
https://dawn-review.googlesource.com/c/tint/+/45382

I had removed too much of ValidatorImpl::ValidateFunction, including
its pushing of function parameters to the variable stack. As a result,,
any function parameters referenced by a function would fail the
Validator. This CL restores this bit, and adds a test for this case.

Bug: tint:642
Change-Id: I839057e73cabfb11631571ce806dec09f5d9f966
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/45500
Auto-Submit: Antonio Maiorano <amaiorano@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
This commit is contained in:
Antonio Maiorano 2021-03-22 09:18:13 +00:00 committed by Commit Bot service account
parent 00e823ec04
commit 4daddd1759
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/validator/validator_function_test.cc
View File

@ -173,7 +173,6 @@ TEST_F(ValidateFunctionTest,
"return type, returned '__u32', expected '__alias_tint_symbol_1__f32'"); "return type, returned '__u32', expected '__alias_tint_symbol_1__f32'");
} }
TEST_F(ValidateFunctionTest, PipelineStage_MustBeUnique_Fail) { TEST_F(ValidateFunctionTest, PipelineStage_MustBeUnique_Fail) {
// [[stage(fragment)]] // [[stage(fragment)]]
// [[stage(vertex)]] // [[stage(vertex)]]
@ -229,5 +228,23 @@ TEST_F(ValidateFunctionTest, OnePipelineStageFunctionMustBePresent_Fail) {
"be present"); "be present");
} }
TEST_F(ValidateFunctionTest, FunctionVarInitWithParam) {
// fn foo(bar : f32) -> void{
// var baz : f32 = bar;
// }
auto* bar = Var("bar", ty.f32(), ast::StorageClass::kFunction);
auto* baz = Var("baz", ty.f32(), ast::StorageClass::kFunction, Expr("bar"));
Func("foo", ast::VariableList{bar}, ty.void_(), ast::StatementList{Decl(baz)},
ast::DecorationList{
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
});
ValidatorImpl& v = Build();
EXPECT_TRUE(v.Validate()) << v.error();
}
} // namespace } // namespace
} // namespace tint } // namespace tint

6
src/validator/validator_impl.cc
View File

@ -170,9 +170,15 @@ bool ValidatorImpl::ValidateEntryPoint(const ast::FunctionList& funcs) {
bool ValidatorImpl::ValidateFunction(const ast::Function* func) { bool ValidatorImpl::ValidateFunction(const ast::Function* func) {
// TODO(amaiorano): Remove ValidateFunction once we've moved all the statement // TODO(amaiorano): Remove ValidateFunction once we've moved all the statement
// validation to Resovler // validation to Resovler
variable_stack_.push_scope();
for (auto* param : func->params()) {
variable_stack_.set(param->symbol(), param);
}
if (!ValidateStatements(func->body())) { if (!ValidateStatements(func->body())) {
return false; return false;
} }
variable_stack_.pop_scope();
return true; return true;
} }