Cleanup code using RegisterSymbol
This CL goes through and converts things which call RegisterSymbol to
use the helper builders. Several variables are also updated to use the
helper as it will need RegisterSymbol in the near future.
Change-Id: Ib5a8e8be54c1eaad123384fab09f6625421d9fcd
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/35880
Commit-Queue: dan sinclair <dsinclair@chromium.org>
Commit-Queue: David Neto <dneto@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Reviewed-by: David Neto <dneto@google.com>
Auto-Submit: dan sinclair <dsinclair@chromium.org>
diff --git a/src/type_determiner_test.cc b/src/type_determiner_test.cc
index f352140..e451160 100644
--- a/src/type_determiner_test.cc
+++ b/src/type_determiner_test.cc
@@ -384,10 +384,9 @@
TEST_F(TypeDeterminerTest, Expr_ArrayAccessor_Alias_Array) {
ast::type::Array ary(ty.f32, 3, ast::ArrayDecorationList{});
- ast::type::Alias aary(mod->RegisterSymbol("myarrty"), "myarrty", &ary);
+ auto* aary = ty.alias("myarrty", &ary);
- auto* var = Var("my_var", ast::StorageClass::kFunction, &aary);
- mod->AddGlobalVariable(var);
+ mod->AddGlobalVariable(Var("my_var", ast::StorageClass::kFunction, aary));
EXPECT_TRUE(td()->Determine());
@@ -770,9 +769,8 @@
Member("second_member", ty.f32)},
ast::StructDecorationList{});
- ast::type::Struct st(mod->RegisterSymbol("S"), "S", strct);
-
- auto* var = Var("my_struct", ast::StorageClass::kNone, &st);
+ auto* st = ty.struct_("S", strct);
+ auto* var = Var("my_struct", ast::StorageClass::kNone, st);
mod->AddGlobalVariable(var);
@@ -793,11 +791,9 @@
Member("second_member", ty.f32)},
ast::StructDecorationList{});
- auto st = std::make_unique<ast::type::Struct>(mod->RegisterSymbol("alias"),
- "alias", strct);
- ast::type::Alias alias(mod->RegisterSymbol("alias"), "alias", st.get());
-
- auto* var = Var("my_struct", ast::StorageClass::kNone, &alias);
+ auto* st = ty.struct_("alias", strct);
+ auto* alias = ty.alias("alias", st);
+ auto* var = Var("my_struct", ast::StorageClass::kNone, alias);
mod->AddGlobalVariable(var);
@@ -873,18 +869,15 @@
auto* strctB =
create<ast::Struct>(ast::StructMemberList{Member("foo", ty.vec4<f32>())},
ast::StructDecorationList{});
- ast::type::Struct stB(mod->RegisterSymbol("B"), "B", strctB);
+ auto* stB = ty.struct_("B", strctB);
- ast::type::Vector vecB(&stB, 3);
+ ast::type::Vector vecB(stB, 3);
auto* strctA = create<ast::Struct>(
ast::StructMemberList{Member("mem", &vecB)}, ast::StructDecorationList{});
- ast::type::Struct stA(mod->RegisterSymbol("A"), "A", strctA);
-
- auto* var = Var("c", ast::StorageClass::kNone, &stA);
-
+ auto* stA = ty.struct_("A", strctA);
+ auto* var = Var("c", ast::StorageClass::kNone, stA);
mod->AddGlobalVariable(var);
-
EXPECT_TRUE(td()->Determine());
auto* mem = MemberAccessor(