Fix GCC warnings / errors
Fixed: tint:636
Change-Id: Ic1bb602b07d659e553d8cb09fd5898482c40c0c1
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/44681
Reviewed-by: David Neto <dneto@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
diff --git a/src/transform/bound_array_accessors_test.cc b/src/transform/bound_array_accessors_test.cc
index c5bef53..67a831c 100644
--- a/src/transform/bound_array_accessors_test.cc
+++ b/src/transform/bound_array_accessors_test.cc
@@ -43,7 +43,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -73,7 +73,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -95,7 +95,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -121,7 +121,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -143,7 +143,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -165,7 +165,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -187,7 +187,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -213,7 +213,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -235,7 +235,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -261,7 +261,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -286,7 +286,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -308,7 +308,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -330,7 +330,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -352,7 +352,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -378,7 +378,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -404,7 +404,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -426,7 +426,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -448,7 +448,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -470,7 +470,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -492,7 +492,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
@@ -559,7 +559,7 @@
}
)";
- auto got = Transform<BoundArrayAccessors>(src);
+ auto got = Run<BoundArrayAccessors>(src);
EXPECT_EQ(expect, str(got));
}
diff --git a/src/transform/emit_vertex_point_size_test.cc b/src/transform/emit_vertex_point_size_test.cc
index 5fc7dba..4d4e5ed 100644
--- a/src/transform/emit_vertex_point_size_test.cc
+++ b/src/transform/emit_vertex_point_size_test.cc
@@ -52,7 +52,7 @@
}
)";
- auto got = Transform<EmitVertexPointSize>(src);
+ auto got = Run<EmitVertexPointSize>(src);
EXPECT_EQ(expect, str(got));
}
@@ -85,7 +85,7 @@
}
)";
- auto got = Transform<EmitVertexPointSize>(src);
+ auto got = Run<EmitVertexPointSize>(src);
EXPECT_EQ(expect, str(got));
}
@@ -111,7 +111,7 @@
}
)";
- auto got = Transform<EmitVertexPointSize>(src);
+ auto got = Run<EmitVertexPointSize>(src);
EXPECT_EQ(expect, str(got));
}
diff --git a/src/transform/first_index_offset_test.cc b/src/transform/first_index_offset_test.cc
index 3370cf4..ef8965b 100644
--- a/src/transform/first_index_offset_test.cc
+++ b/src/transform/first_index_offset_test.cc
@@ -47,7 +47,7 @@
transforms.emplace_back(std::make_unique<FirstIndexOffset>(0, 0));
transforms.emplace_back(std::make_unique<FirstIndexOffset>(1, 1));
- auto got = Transform(src, std::move(transforms));
+ auto got = Run(src, std::move(transforms));
EXPECT_EQ(expect, str(got));
@@ -64,7 +64,7 @@
auto* src = "";
auto* expect = "";
- auto got = Transform<FirstIndexOffset>(src, 0, 0);
+ auto got = Run<FirstIndexOffset>(src, 0, 0);
EXPECT_EQ(expect, str(got));
@@ -112,7 +112,7 @@
}
)";
- auto got = Transform<FirstIndexOffset>(src, 1, 2);
+ auto got = Run<FirstIndexOffset>(src, 1, 2);
EXPECT_EQ(expect, str(got));
@@ -160,7 +160,7 @@
}
)";
- auto got = Transform<FirstIndexOffset>(src, 1, 7);
+ auto got = Run<FirstIndexOffset>(src, 1, 7);
EXPECT_EQ(expect, str(got));
@@ -213,7 +213,7 @@
}
)";
- auto got = Transform<FirstIndexOffset>(src, 1, 2);
+ auto got = Run<FirstIndexOffset>(src, 1, 2);
EXPECT_EQ(expect, str(got));
@@ -269,7 +269,7 @@
}
)";
- auto got = Transform<FirstIndexOffset>(src, 1, 2);
+ auto got = Run<FirstIndexOffset>(src, 1, 2);
EXPECT_EQ(expect, str(got));
diff --git a/src/transform/hlsl_test.cc b/src/transform/hlsl_test.cc
index b05fdba..f0d81bd 100644
--- a/src/transform/hlsl_test.cc
+++ b/src/transform/hlsl_test.cc
@@ -46,7 +46,7 @@
}
)";
- auto got = Transform<Hlsl>(src);
+ auto got = Run<Hlsl>(src);
EXPECT_EQ(expect, str(got));
}
@@ -69,7 +69,7 @@
}
)";
- auto got = Transform<Hlsl>(src);
+ auto got = Run<Hlsl>(src);
EXPECT_EQ(expect, str(got));
}
@@ -86,7 +86,7 @@
auto* expect = src;
- auto got = Transform<Hlsl>(src);
+ auto got = Run<Hlsl>(src);
EXPECT_EQ(expect, str(got));
}
@@ -138,7 +138,7 @@
}
)";
- auto got = Transform<Hlsl>(src);
+ auto got = Run<Hlsl>(src);
EXPECT_EQ(expect, str(got));
}
diff --git a/src/transform/msl.cc b/src/transform/msl.cc
index 96f5f04..3733d10 100644
--- a/src/transform/msl.cc
+++ b/src/transform/msl.cc
@@ -320,7 +320,7 @@
}
auto* deco = param->decorations()[0];
- if (auto* builtin = deco->As<ast::BuiltinDecoration>()) {
+ if (deco->Is<ast::BuiltinDecoration>()) {
// Keep any builtin-decorated parameters unchanged.
builtins.insert(param);
continue;
diff --git a/src/transform/msl_test.cc b/src/transform/msl_test.cc
index 915d591..c6da8c9 100644
--- a/src/transform/msl_test.cc
+++ b/src/transform/msl_test.cc
@@ -55,7 +55,7 @@
}
)";
- auto got = Transform<Msl>(src);
+ auto got = Run<Msl>(src);
EXPECT_EQ(expect, str(got));
}
@@ -79,7 +79,7 @@
}
)";
- auto got = Transform<Msl>(src);
+ auto got = Run<Msl>(src);
EXPECT_EQ(expect, str(got));
}
@@ -354,7 +354,7 @@
}
)";
- auto got = Transform<Msl>(src);
+ auto got = Run<Msl>(src);
EXPECT_EQ(expect, str(got));
}
@@ -396,7 +396,7 @@
}
)";
- auto got = Transform<Msl>(src);
+ auto got = Run<Msl>(src);
EXPECT_EQ(expect, str(got));
}
diff --git a/src/transform/renamer_test.cc b/src/transform/renamer_test.cc
index 2b3b039..887cfaa 100644
--- a/src/transform/renamer_test.cc
+++ b/src/transform/renamer_test.cc
@@ -29,7 +29,7 @@
auto* src = "";
auto* expect = "";
- auto got = Transform<Renamer>(src);
+ auto got = Run<Renamer>(src);
EXPECT_EQ(expect, str(got));
@@ -65,7 +65,7 @@
}
)";
- auto got = Transform<Renamer>(src);
+ auto got = Run<Renamer>(src);
EXPECT_EQ(expect, str(got));
@@ -101,7 +101,7 @@
}
)";
- auto got = Transform<Renamer>(src);
+ auto got = Run<Renamer>(src);
EXPECT_EQ(expect, str(got));
@@ -134,7 +134,7 @@
}
)";
- auto got = Transform<Renamer>(src);
+ auto got = Run<Renamer>(src);
EXPECT_EQ(expect, str(got));
diff --git a/src/transform/spirv_test.cc b/src/transform/spirv_test.cc
index 2e66ce2..f85e318 100644
--- a/src/transform/spirv_test.cc
+++ b/src/transform/spirv_test.cc
@@ -57,7 +57,7 @@
}
)";
- auto got = Transform<Spirv>(src);
+ auto got = Run<Spirv>(src);
EXPECT_EQ(expect, str(got));
}
@@ -89,7 +89,7 @@
}
)";
- auto got = Transform<Spirv>(src);
+ auto got = Run<Spirv>(src);
EXPECT_EQ(expect, str(got));
}
@@ -133,7 +133,7 @@
}
)";
- auto got = Transform<Spirv>(src);
+ auto got = Run<Spirv>(src);
EXPECT_EQ(expect, str(got));
}
@@ -164,7 +164,7 @@
}
)";
- auto got = Transform<Spirv>(src);
+ auto got = Run<Spirv>(src);
EXPECT_EQ(expect, str(got));
}
diff --git a/src/transform/test_helper.h b/src/transform/test_helper.h
index aa6ae96..f8fc8b5 100644
--- a/src/transform/test_helper.h
+++ b/src/transform/test_helper.h
@@ -37,7 +37,7 @@
/// @param in the input WGSL source
/// @param transforms the list of transforms to apply
/// @return the transformed output
- Transform::Output Transform(
+ Transform::Output Run(
std::string in,
std::vector<std::unique_ptr<transform::Transform>> transforms) {
auto file = std::make_unique<Source::File>("test", in);
@@ -62,11 +62,11 @@
/// @param transform the transform to apply
/// @param in the input WGSL source
/// @return the transformed output
- Transform::Output Transform(std::string in,
- std::unique_ptr<transform::Transform> transform) {
+ Transform::Output Run(std::string in,
+ std::unique_ptr<transform::Transform> transform) {
std::vector<std::unique_ptr<transform::Transform>> transforms;
transforms.emplace_back(std::move(transform));
- return Transform(std::move(in), std::move(transforms));
+ return Run(std::move(in), std::move(transforms));
}
/// Transforms and returns the WGSL source `in`, transformed using
@@ -75,9 +75,9 @@
/// @param args the TRANSFORM constructor arguments
/// @return the transformed output
template <typename TRANSFORM, typename... ARGS>
- Transform::Output Transform(std::string in, ARGS&&... args) {
- return Transform(std::move(in),
- std::make_unique<TRANSFORM>(std::forward<ARGS>(args)...));
+ Transform::Output Run(std::string in, ARGS&&... args) {
+ return Run(std::move(in),
+ std::make_unique<TRANSFORM>(std::forward<ARGS>(args)...));
}
/// @param output the output of the transform
diff --git a/src/transform/vertex_pulling_test.cc b/src/transform/vertex_pulling_test.cc
index b4e1080..d36dcaa 100644
--- a/src/transform/vertex_pulling_test.cc
+++ b/src/transform/vertex_pulling_test.cc
@@ -33,7 +33,7 @@
auto transform = std::make_unique<VertexPulling>(cfg);
- auto got = Transform(src, std::move(transform));
+ auto got = Run(src, std::move(transform));
EXPECT_EQ(expect, str(got));
}
@@ -51,7 +51,7 @@
auto transform = std::make_unique<VertexPulling>(cfg);
- auto got = Transform(src, std::move(transform));
+ auto got = Run(src, std::move(transform));
EXPECT_EQ(expect, str(got));
}
@@ -69,7 +69,7 @@
auto transform = std::make_unique<VertexPulling>(cfg);
- auto got = Transform(src, std::move(transform));
+ auto got = Run(src, std::move(transform));
EXPECT_EQ(expect, str(got));
}
@@ -99,7 +99,7 @@
auto transform = std::make_unique<VertexPulling>(cfg);
- auto got = Transform(src, std::move(transform));
+ auto got = Run(src, std::move(transform));
EXPECT_EQ(expect, str(got));
}
@@ -141,7 +141,7 @@
auto transform = std::make_unique<VertexPulling>(cfg);
- auto got = Transform(src, std::move(transform));
+ auto got = Run(src, std::move(transform));
EXPECT_EQ(expect, str(got));
}
@@ -183,7 +183,7 @@
auto transform = std::make_unique<VertexPulling>(cfg);
- auto got = Transform(src, std::move(transform));
+ auto got = Run(src, std::move(transform));
EXPECT_EQ(expect, str(got));
}
@@ -226,7 +226,7 @@
auto transform = std::make_unique<VertexPulling>(cfg);
- auto got = Transform(src, std::move(transform));
+ auto got = Run(src, std::move(transform));
EXPECT_EQ(expect, str(got));
}
@@ -290,7 +290,7 @@
auto transform = std::make_unique<VertexPulling>(cfg);
- auto got = Transform(src, std::move(transform));
+ auto got = Run(src, std::move(transform));
EXPECT_EQ(expect, str(got));
}
@@ -339,7 +339,7 @@
auto transform = std::make_unique<VertexPulling>(cfg);
- auto got = Transform(src, std::move(transform));
+ auto got = Run(src, std::move(transform));
EXPECT_EQ(expect, str(got));
}
@@ -398,7 +398,7 @@
auto transform = std::make_unique<VertexPulling>(cfg);
- auto got = Transform(src, std::move(transform));
+ auto got = Run(src, std::move(transform));
EXPECT_EQ(expect, str(got));
}
diff --git a/src/validator/validator_decoration_test.cc b/src/validator/validator_decoration_test.cc
index b4dc099..58ab2d5 100644
--- a/src/validator/validator_decoration_test.cc
+++ b/src/validator/validator_decoration_test.cc
@@ -75,6 +75,7 @@
case DecorationKind::kConstantId:
return builder.create<ast::ConstantIdDecoration>(0u);
}
+ return nullptr;
}
using ArrayDecorationTest = ValidatorDecorationsTestWithParams;
