commit c8af502c010f1236177dfa21e3e84736cbab89b3
author Ryan Harrison <rharrison@chromium.org> Mon Jul 20 19:54:23 2020 +0000
committer dan sinclair <dsinclair@chromium.org> Mon Jul 20 19:54:23 2020 +0000
tree 7e2c8c660f20d9fa03a4a95951ee16c3f86e625f
parent 18c85f52e482845079a26a22c9dfc633bf7a11a7

Fix issues with BUILD.gn

Couple of little style issues, and a path to a file that was incorrect.

Change-Id: I21d1a4ca41bc36163602378086989ac712f54469
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/25265
Reviewed-by: dan sinclair <dsinclair@chromium.org>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 9c54195..a1a0841 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -904,7 +904,6 @@
     "src/writer/wgsl/generator_impl_kill_test.cc",
     "src/writer/wgsl/generator_impl_loop_test.cc",
     "src/writer/wgsl/generator_impl_member_accessor_test.cc",
-    "src/writer/wgsl/generator_impl_module_constant_test.cc",
     "src/writer/wgsl/generator_impl_return_test.cc",
     "src/writer/wgsl/generator_impl_switch_test.cc",
     "src/writer/wgsl/generator_impl_test.cc",
@@ -953,6 +952,7 @@
     "src/writer/msl/generator_impl_kill_test.cc",
     "src/writer/msl/generator_impl_loop_test.cc",
     "src/writer/msl/generator_impl_member_accessor_test.cc",
+    "src/writer/msl/generator_impl_module_constant_test.cc",
     "src/writer/msl/generator_impl_return_test.cc",
     "src/writer/msl/generator_impl_switch_test.cc",
     "src/writer/msl/generator_impl_test.cc",

src/ast/function_test.cc

diff --git a/src/ast/function_test.cc b/src/ast/function_test.cc
index 127719c..72c39e1 100644
--- a/src/ast/function_test.cc
+++ b/src/ast/function_test.cc
@@ -119,9 +119,9 @@
   auto ref_locs = f.referenced_location_variables();
   ASSERT_EQ(ref_locs.size(), 2u);
   EXPECT_EQ(ref_locs[0].first, &loc1);
-  EXPECT_EQ(ref_locs[0].second->value(), 0);
+  EXPECT_EQ(ref_locs[0].second->value(), 0u);
   EXPECT_EQ(ref_locs[1].first, &loc2);
-  EXPECT_EQ(ref_locs[1].second->value(), 1);
+  EXPECT_EQ(ref_locs[1].second->value(), 1u);
 }
 
 TEST_F(FunctionTest, GetReferenceBuiltins) {

src/writer/msl/generator_impl.cc

diff --git a/src/writer/msl/generator_impl.cc b/src/writer/msl/generator_impl.cc
index b3af01d..2c6411e 100644
--- a/src/writer/msl/generator_impl.cc
+++ b/src/writer/msl/generator_impl.cc
@@ -651,8 +651,8 @@
   std::vector<std::pair<ast::Variable*, ast::VariableDecoration*>>
       out_variables;
   for (auto data : func->referenced_location_variables()) {
-    auto var = data.first;
-    auto deco = data.second;
+    auto* var = data.first;
+    auto* deco = data.second;
 
     if (var->storage_class() == ast::StorageClass::kInput) {
       in_locations.push_back({var, deco->value()});
@@ -662,8 +662,8 @@
   }
 
   for (auto data : func->referenced_builtin_variables()) {
-    auto var = data.first;
-    auto deco = data.second;
+    auto* var = data.first;
+    auto* deco = data.second;
 
     if (var->storage_class() == ast::StorageClass::kOutput) {
       out_variables.push_back({var, deco});
@@ -819,7 +819,7 @@
 
 bool GeneratorImpl::has_referenced_var_needing_struct(ast::Function* func) {
   for (auto data : func->referenced_location_variables()) {
-    auto var = data.first;
+    auto* var = data.first;
     if (var->storage_class() == ast::StorageClass::kInput ||
         var->storage_class() == ast::StorageClass::kOutput) {
       return true;
@@ -827,7 +827,7 @@
   }
 
   for (auto data : func->referenced_builtin_variables()) {
-    auto var = data.first;
+    auto* var = data.first;
     if (var->storage_class() == ast::StorageClass::kOutput) {
       return true;
     }