commit ab5fc1c4dcdc0f5ac69b463bf18d15112c2326ee
author dan sinclair <dsinclair@chromium.org> Tue Aug 02 19:43:14 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Aug 02 19:43:14 2022 +0000
tree 14d60e9bd10f595f2e86f0e63c2912c434f4b8f5
parent c2272b852e52ac4875da85ca9c00347898a44316

Fixup utils::Vector merge conflicts.

This CL fixes various util::Vector calls that were needed after
the push constant CL landed.

Change-Id: I0a21ad61ece6327b8789c5c083f4d1fcfd6339b1
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/98040
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Auto-Submit: Dan Sinclair <dsinclair@chromium.org>

src/tint/resolver/entry_point_validation_test.cc

diff --git a/src/tint/resolver/entry_point_validation_test.cc b/src/tint/resolver/entry_point_validation_test.cc
index 38ebc81..d997912 100644
--- a/src/tint/resolver/entry_point_validation_test.cc
+++ b/src/tint/resolver/entry_point_validation_test.cc
@@ -471,7 +471,7 @@
 TEST_F(ResolverEntryPointValidationTest, PushConstantAllowedWithIgnoreStorageClassAttribute) {
     // var<push_constant> a : u32; // With ast::DisabledValidation::kIgnoreStorageClass
     GlobalVar("a", ty.u32(), ast::StorageClass::kPushConstant,
-              ast::AttributeList{Disable(ast::DisabledValidation::kIgnoreStorageClass)});
+              utils::Vector{Disable(ast::DisabledValidation::kIgnoreStorageClass)});
 
     EXPECT_TRUE(r()->Resolve());
 }
@@ -485,8 +485,9 @@
     Enable(ast::Extension::kChromiumExperimentalPushConstant);
     GlobalVar("a", ty.u32(), ast::StorageClass::kPushConstant);
 
-    Func("main", {}, ty.void_(), {Assign(Phony(), "a")},
-         {Stage(ast::PipelineStage::kCompute), create<ast::WorkgroupAttribute>(Expr(1_i))});
+    Func("main", {}, ty.void_(), utils::Vector{Assign(Phony(), "a")},
+         utils::Vector{Stage(ast::PipelineStage::kCompute),
+                       create<ast::WorkgroupAttribute>(Expr(1_i))});
 
     EXPECT_TRUE(r()->Resolve());
 }
@@ -503,8 +504,10 @@
     GlobalVar(Source{{1, 2}}, "a", ty.u32(), ast::StorageClass::kPushConstant);
     GlobalVar(Source{{3, 4}}, "b", ty.u32(), ast::StorageClass::kPushConstant);
 
-    Func(Source{{5, 6}}, "main", {}, ty.void_(), {Assign(Phony(), "a"), Assign(Phony(), "b")},
-         {Stage(ast::PipelineStage::kCompute), create<ast::WorkgroupAttribute>(Expr(1_i))});
+    Func(Source{{5, 6}}, "main", {}, ty.void_(),
+         utils::Vector{Assign(Phony(), "a"), Assign(Phony(), "b")},
+         utils::Vector{Stage(ast::PipelineStage::kCompute),
+                       create<ast::WorkgroupAttribute>(Expr(1_i))});
 
     EXPECT_FALSE(r()->Resolve());
     EXPECT_EQ(r()->error(),
@@ -532,12 +535,13 @@
     GlobalVar(Source{{1, 2}}, "a", ty.u32(), ast::StorageClass::kPushConstant);
     GlobalVar(Source{{3, 4}}, "b", ty.u32(), ast::StorageClass::kPushConstant);
 
-    Func(Source{{5, 6}}, "uses_a", {}, ty.void_(), {Assign(Phony(), "a")});
-    Func(Source{{7, 8}}, "uses_b", {}, ty.void_(), {Assign(Phony(), "b")});
+    Func(Source{{5, 6}}, "uses_a", {}, ty.void_(), utils::Vector{Assign(Phony(), "a")});
+    Func(Source{{7, 8}}, "uses_b", {}, ty.void_(), utils::Vector{Assign(Phony(), "b")});
 
     Func(Source{{9, 10}}, "main", {}, ty.void_(),
-         {CallStmt(Call("uses_a")), CallStmt(Call("uses_b"))},
-         {Stage(ast::PipelineStage::kCompute), create<ast::WorkgroupAttribute>(Expr(1_i))});
+         utils::Vector{CallStmt(Call("uses_a")), CallStmt(Call("uses_b"))},
+         utils::Vector{Stage(ast::PipelineStage::kCompute),
+                       create<ast::WorkgroupAttribute>(Expr(1_i))});
 
     EXPECT_FALSE(r()->Resolve());
     EXPECT_EQ(r()->error(),
@@ -564,10 +568,12 @@
     GlobalVar("a", ty.u32(), ast::StorageClass::kPushConstant);
     GlobalVar("b", ty.u32(), ast::StorageClass::kPushConstant);
 
-    Func("uses_a", {}, ty.void_(), {Assign(Phony(), "a")},
-         {Stage(ast::PipelineStage::kCompute), create<ast::WorkgroupAttribute>(Expr(1_i))});
-    Func("uses_b", {}, ty.void_(), {Assign(Phony(), "b")},
-         {Stage(ast::PipelineStage::kCompute), create<ast::WorkgroupAttribute>(Expr(1_i))});
+    Func("uses_a", {}, ty.void_(), utils::Vector{Assign(Phony(), "a")},
+         utils::Vector{Stage(ast::PipelineStage::kCompute),
+                       create<ast::WorkgroupAttribute>(Expr(1_i))});
+    Func("uses_b", {}, ty.void_(), utils::Vector{Assign(Phony(), "b")},
+         utils::Vector{Stage(ast::PipelineStage::kCompute),
+                       create<ast::WorkgroupAttribute>(Expr(1_i))});
 
     EXPECT_TRUE(r()->Resolve());
 }