Remove BlockStatement::append()

Bug: tint:396
Bug: tint:390
Change-Id: I3b558a8961f9890f24d1aa3d6647ec095e5fe1cb
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/35421
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: David Neto <dneto@google.com>
Reviewed-by: dan sinclair <dsinclair@chromium.org>

src/validator/validator_control_block_test.cc

@@ -57,14 +57,17 @@ TEST_F(ValidateControlBlockTest, SwitchSelectorExpressionNoneIntegerType_Fail) {
   auto* cond = create<ast::IdentifierExpression>(
       Source{Source::Location{12, 34}}, mod()->RegisterSymbol("a"), "a");
   ast::CaseSelectorList default_csl;
-  auto* block_default = create<ast::BlockStatement>(Source{});
+  auto* block_default =
+      create<ast::BlockStatement>(Source{}, ast::StatementList{});
   ast::CaseStatementList body;
   body.push_back(
       create<ast::CaseStatement>(Source{}, default_csl, block_default));
 
-  auto* block = create<ast::BlockStatement>(Source{});
-  block->append(create<ast::VariableDeclStatement>(Source{}, var));
-  block->append(create<ast::SwitchStatement>(Source{}, cond, body));
+  auto* block = create<ast::BlockStatement>(
+      Source{}, ast::StatementList{
+                    create<ast::VariableDeclStatement>(Source{}, var),
+                    create<ast::SwitchStatement>(Source{}, cond, body),
+                });
 
   EXPECT_TRUE(td()->DetermineStatements(block)) << td()->error();
   EXPECT_FALSE(v()->ValidateStatements(block));
@@ -96,12 +99,15 @@ TEST_F(ValidateControlBlockTest, SwitchWithoutDefault_Fail) {
   csl.push_back(create<ast::SintLiteral>(Source{}, &i32, 1));
   ast::CaseStatementList body;
   body.push_back(create<ast::CaseStatement>(
-      Source{}, csl, create<ast::BlockStatement>(Source{})));
+      Source{}, csl,
+      create<ast::BlockStatement>(Source{}, ast::StatementList{})));
 
-  auto* block = create<ast::BlockStatement>(Source{});
-  block->append(create<ast::VariableDeclStatement>(Source{}, var));
-  block->append(create<ast::SwitchStatement>(Source{Source::Location{12, 34}},
-                                             cond, body));
+  auto* block = create<ast::BlockStatement>(
+      Source{}, ast::StatementList{
+                    create<ast::VariableDeclStatement>(Source{}, var),
+                    create<ast::SwitchStatement>(
+                        Source{Source::Location{12, 34}}, cond, body),
+                });
 
   EXPECT_TRUE(td()->DetermineStatements(block)) << td()->error();
   EXPECT_FALSE(v()->ValidateStatements(block));
@@ -134,25 +140,30 @@ TEST_F(ValidateControlBlockTest, SwitchWithTwoDefault_Fail) {
       Source{}, mod()->RegisterSymbol("a"), "a");
 
   ast::CaseSelectorList default_csl_1;
-  auto* block_default_1 = create<ast::BlockStatement>(Source{});
+  auto* block_default_1 =
+      create<ast::BlockStatement>(Source{}, ast::StatementList{});
   switch_body.push_back(
       create<ast::CaseStatement>(Source{}, default_csl_1, block_default_1));
 
   ast::CaseSelectorList csl_case_1;
   csl_case_1.push_back(create<ast::SintLiteral>(Source{}, &i32, 1));
-  auto* block_case_1 = create<ast::BlockStatement>(Source{});
+  auto* block_case_1 =
+      create<ast::BlockStatement>(Source{}, ast::StatementList{});
   switch_body.push_back(
       create<ast::CaseStatement>(Source{}, csl_case_1, block_case_1));
 
   ast::CaseSelectorList default_csl_2;
-  auto* block_default_2 = create<ast::BlockStatement>(Source{});
+  auto* block_default_2 =
+      create<ast::BlockStatement>(Source{}, ast::StatementList{});
   switch_body.push_back(
       create<ast::CaseStatement>(Source{}, default_csl_2, block_default_2));
 
-  auto* block = create<ast::BlockStatement>(Source{});
-  block->append(create<ast::VariableDeclStatement>(Source{}, var));
-  block->append(create<ast::SwitchStatement>(Source{Source::Location{12, 34}},
-                                             cond, switch_body));
+  auto* block = create<ast::BlockStatement>(
+      Source{}, ast::StatementList{
+                    create<ast::VariableDeclStatement>(Source{}, var),
+                    create<ast::SwitchStatement>(
+                        Source{Source::Location{12, 34}}, cond, switch_body),
+                });
 
   EXPECT_TRUE(td()->DetermineStatements(block)) << td()->error();
   EXPECT_FALSE(v()->ValidateStatements(block));
@@ -187,19 +198,21 @@ TEST_F(ValidateControlBlockTest,
 
   ast::CaseSelectorList csl;
   csl.push_back(create<ast::UintLiteral>(Source{}, &u32, 1));
-  switch_body.push_back(
-      create<ast::CaseStatement>(Source{Source::Location{12, 34}}, csl,
-                                 create<ast::BlockStatement>(Source{})));
+  switch_body.push_back(create<ast::CaseStatement>(
+      Source{Source::Location{12, 34}}, csl,
+      create<ast::BlockStatement>(Source{}, ast::StatementList{})));
 
   ast::CaseSelectorList default_csl;
-  auto* block_default = create<ast::BlockStatement>(Source{});
+  auto* block_default =
+      create<ast::BlockStatement>(Source{}, ast::StatementList{});
   switch_body.push_back(
       create<ast::CaseStatement>(Source{}, default_csl, block_default));
 
-  auto* block = create<ast::BlockStatement>(Source{});
-  block->append(create<ast::VariableDeclStatement>(Source{}, var));
-  block->append(create<ast::SwitchStatement>(Source{}, cond, switch_body));
-
+  auto* block = create<ast::BlockStatement>(
+      Source{}, ast::StatementList{
+                    create<ast::VariableDeclStatement>(Source{}, var),
+                    create<ast::SwitchStatement>(Source{}, cond, switch_body),
+                });
   EXPECT_TRUE(td()->DetermineStatements(block)) << td()->error();
   EXPECT_FALSE(v()->ValidateStatements(block));
   EXPECT_EQ(v()->error(),
@@ -233,19 +246,21 @@ TEST_F(ValidateControlBlockTest,
 
   ast::CaseSelectorList csl;
   csl.push_back(create<ast::SintLiteral>(Source{}, &i32, -1));
-  switch_body.push_back(
-      create<ast::CaseStatement>(Source{Source::Location{12, 34}}, csl,
-                                 create<ast::BlockStatement>(Source{})));
+  switch_body.push_back(create<ast::CaseStatement>(
+      Source{Source::Location{12, 34}}, csl,
+      create<ast::BlockStatement>(Source{}, ast::StatementList{})));
 
   ast::CaseSelectorList default_csl;
-  auto* block_default = create<ast::BlockStatement>(Source{});
+  auto* block_default =
+      create<ast::BlockStatement>(Source{}, ast::StatementList{});
   switch_body.push_back(
       create<ast::CaseStatement>(Source{}, default_csl, block_default));
 
-  auto* block = create<ast::BlockStatement>(Source{});
-  block->append(create<ast::VariableDeclStatement>(Source{}, var));
-  block->append(create<ast::SwitchStatement>(Source{}, cond, switch_body));
-
+  auto* block = create<ast::BlockStatement>(
+      Source{}, ast::StatementList{
+                    create<ast::VariableDeclStatement>(Source{}, var),
+                    create<ast::SwitchStatement>(Source{}, cond, switch_body),
+                });
   EXPECT_TRUE(td()->DetermineStatements(block)) << td()->error();
   EXPECT_FALSE(v()->ValidateStatements(block));
   EXPECT_EQ(v()->error(),
@@ -279,24 +294,27 @@ TEST_F(ValidateControlBlockTest, NonUniqueCaseSelectorValueUint_Fail) {
   ast::CaseSelectorList csl_1;
   csl_1.push_back(create<ast::UintLiteral>(Source{}, &u32, 0));
   switch_body.push_back(create<ast::CaseStatement>(
-      Source{}, csl_1, create<ast::BlockStatement>(Source{})));
+      Source{}, csl_1,
+      create<ast::BlockStatement>(Source{}, ast::StatementList{})));
 
   ast::CaseSelectorList csl_2;
   csl_2.push_back(create<ast::UintLiteral>(Source{}, &u32, 2));
   csl_2.push_back(create<ast::UintLiteral>(Source{}, &u32, 2));
-  switch_body.push_back(
-      create<ast::CaseStatement>(Source{Source::Location{12, 34}}, csl_2,
-                                 create<ast::BlockStatement>(Source{})));
+  switch_body.push_back(create<ast::CaseStatement>(
+      Source{Source::Location{12, 34}}, csl_2,
+      create<ast::BlockStatement>(Source{}, ast::StatementList{})));
 
   ast::CaseSelectorList default_csl;
-  auto* block_default = create<ast::BlockStatement>(Source{});
+  auto* block_default =
+      create<ast::BlockStatement>(Source{}, ast::StatementList{});
   switch_body.push_back(
       create<ast::CaseStatement>(Source{}, default_csl, block_default));
 
-  auto* block = create<ast::BlockStatement>(Source{});
-  block->append(create<ast::VariableDeclStatement>(Source{}, var));
-  block->append(create<ast::SwitchStatement>(Source{}, cond, switch_body));
-
+  auto* block = create<ast::BlockStatement>(
+      Source{}, ast::StatementList{
+                    create<ast::VariableDeclStatement>(Source{}, var),
+                    create<ast::SwitchStatement>(Source{}, cond, switch_body),
+                });
   EXPECT_TRUE(td()->DetermineStatements(block)) << td()->error();
   EXPECT_FALSE(v()->ValidateStatements(block));
   EXPECT_EQ(v()->error(),
@@ -330,26 +348,29 @@ TEST_F(ValidateControlBlockTest, NonUniqueCaseSelectorValueSint_Fail) {
   ast::CaseSelectorList csl_1;
   csl_1.push_back(create<ast::SintLiteral>(Source{}, &i32, 10));
   switch_body.push_back(create<ast::CaseStatement>(
-      Source{}, csl_1, create<ast::BlockStatement>(Source{})));
+      Source{}, csl_1,
+      create<ast::BlockStatement>(Source{}, ast::StatementList{})));
 
   ast::CaseSelectorList csl_2;
   csl_2.push_back(create<ast::SintLiteral>(Source{}, &i32, 0));
   csl_2.push_back(create<ast::SintLiteral>(Source{}, &i32, 1));
   csl_2.push_back(create<ast::SintLiteral>(Source{}, &i32, 2));
   csl_2.push_back(create<ast::SintLiteral>(Source{}, &i32, 10));
-  switch_body.push_back(
-      create<ast::CaseStatement>(Source{Source::Location{12, 34}}, csl_2,
-                                 create<ast::BlockStatement>(Source{})));
+  switch_body.push_back(create<ast::CaseStatement>(
+      Source{Source::Location{12, 34}}, csl_2,
+      create<ast::BlockStatement>(Source{}, ast::StatementList{})));
 
   ast::CaseSelectorList default_csl;
-  auto* block_default = create<ast::BlockStatement>(Source{});
+  auto* block_default =
+      create<ast::BlockStatement>(Source{}, ast::StatementList{});
   switch_body.push_back(
       create<ast::CaseStatement>(Source{}, default_csl, block_default));
 
-  auto* block = create<ast::BlockStatement>(Source{});
-  block->append(create<ast::VariableDeclStatement>(Source{}, var));
-  block->append(create<ast::SwitchStatement>(Source{}, cond, switch_body));
-
+  auto* block = create<ast::BlockStatement>(
+      Source{}, ast::StatementList{
+                    create<ast::VariableDeclStatement>(Source{}, var),
+                    create<ast::SwitchStatement>(Source{}, cond, switch_body),
+                });
   EXPECT_TRUE(td()->DetermineStatements(block)) << td()->error();
   EXPECT_FALSE(v()->ValidateStatements(block));
   EXPECT_EQ(v()->error(),
@@ -377,17 +398,20 @@ TEST_F(ValidateControlBlockTest, LastClauseLastStatementIsFallthrough_Fail) {
   auto* cond = create<ast::IdentifierExpression>(
       Source{}, mod()->RegisterSymbol("a"), "a");
   ast::CaseSelectorList default_csl;
-  auto* block_default = create<ast::BlockStatement>(Source{});
-  block_default->append(
-      create<ast::FallthroughStatement>(Source{Source::Location{12, 34}}));
+  auto* block_default = create<ast::BlockStatement>(
+      Source{},
+      ast::StatementList{
+          create<ast::FallthroughStatement>(Source{Source::Location{12, 34}}),
+      });
   ast::CaseStatementList body;
   body.push_back(
       create<ast::CaseStatement>(Source{}, default_csl, block_default));
 
-  auto* block = create<ast::BlockStatement>(Source{});
-  block->append(create<ast::VariableDeclStatement>(Source{}, var));
-  block->append(create<ast::SwitchStatement>(Source{}, cond, body));
-
+  auto* block = create<ast::BlockStatement>(
+      Source{}, ast::StatementList{
+                    create<ast::VariableDeclStatement>(Source{}, var),
+                    create<ast::SwitchStatement>(Source{}, cond, body),
+                });
   EXPECT_TRUE(td()->DetermineStatements(block)) << td()->error();
   EXPECT_FALSE(v()->ValidateStatements(block));
   EXPECT_EQ(v()->error(),
@@ -416,19 +440,22 @@ TEST_F(ValidateControlBlockTest, SwitchCase_Pass) {
   auto* cond = create<ast::IdentifierExpression>(
       Source{}, mod()->RegisterSymbol("a"), "a");
   ast::CaseSelectorList default_csl;
-  auto* block_default = create<ast::BlockStatement>(Source{});
+  auto* block_default =
+      create<ast::BlockStatement>(Source{}, ast::StatementList{});
   ast::CaseStatementList body;
   body.push_back(create<ast::CaseStatement>(Source{Source::Location{12, 34}},
                                             default_csl, block_default));
   ast::CaseSelectorList case_csl;
   case_csl.push_back(create<ast::SintLiteral>(Source{}, &i32, 5));
-  auto* block_case = create<ast::BlockStatement>(Source{});
+  auto* block_case =
+      create<ast::BlockStatement>(Source{}, ast::StatementList{});
   body.push_back(create<ast::CaseStatement>(Source{}, case_csl, block_case));
 
-  auto* block = create<ast::BlockStatement>(Source{});
-  block->append(create<ast::VariableDeclStatement>(Source{}, var));
-  block->append(create<ast::SwitchStatement>(Source{}, cond, body));
-
+  auto* block = create<ast::BlockStatement>(
+      Source{}, ast::StatementList{
+                    create<ast::VariableDeclStatement>(Source{}, var),
+                    create<ast::SwitchStatement>(Source{}, cond, body),
+                });
   EXPECT_TRUE(td()->DetermineStatements(block)) << td()->error();
   EXPECT_TRUE(v()->ValidateStatements(block)) << v()->error();
 }
@@ -457,15 +484,17 @@ TEST_F(ValidateControlBlockTest, SwitchCaseAlias_Pass) {
   auto* cond = create<ast::IdentifierExpression>(
       Source{}, mod()->RegisterSymbol("a"), "a");
   ast::CaseSelectorList default_csl;
-  auto* block_default = create<ast::BlockStatement>(Source{});
+  auto* block_default =
+      create<ast::BlockStatement>(Source{}, ast::StatementList{});
   ast::CaseStatementList body;
   body.push_back(create<ast::CaseStatement>(Source{Source::Location{12, 34}},
                                             default_csl, block_default));
 
-  auto* block = create<ast::BlockStatement>(Source{});
-  block->append(create<ast::VariableDeclStatement>(Source{}, var));
-  block->append(create<ast::SwitchStatement>(Source{}, cond, body));
-
+  auto* block = create<ast::BlockStatement>(
+      Source{}, ast::StatementList{
+                    create<ast::VariableDeclStatement>(Source{}, var),
+                    create<ast::SwitchStatement>(Source{}, cond, body),
+                });
   mod()->AddConstructedType(&my_int);
 
   EXPECT_TRUE(td()->DetermineStatements(block)) << td()->error();