commit 316dcd416638761dbcd2e124428132ad80b4d8d1
author Ben Clayton <bclayton@google.com> Fri Apr 16 10:44:54 2021 +0000
committer Commit Bot service account <commit-bot@chromium.org> Fri Apr 16 10:44:54 2021 +0000
tree 95c1c4a55b7ad149987c95e73a443ea0d65dbcdf
parent 98b084e4a4ceb58881edbfb2bc3e07a7ea511809

UintLiteral::to_str() suffix with 'u'

Fixed: tint:673
Change-Id: I5a58d9e504446ccff724e368b5ea2cf835d2271b
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/47768
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>

src/reader/spirv/function_memory_test.cc

diff --git a/src/reader/spirv/function_memory_test.cc b/src/reader/spirv/function_memory_test.cc
index d0cb02b..6e0c699 100644
--- a/src/reader/spirv/function_memory_test.cc
+++ b/src/reader/spirv/function_memory_test.cc
@@ -80,11 +80,11 @@
   EXPECT_TRUE(fe.EmitBody());
   EXPECT_THAT(ToString(p->builder(), fe.ast_body()), HasSubstr(R"(Assignment{
   Identifier[not set]{x_1}
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
 }
 Assignment{
   Identifier[not set]{x_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 })"));
 }
 
@@ -274,7 +274,7 @@
   EXPECT_TRUE(fe.EmitBody());
   EXPECT_THAT(ToString(p->builder(), fe.ast_body()), HasSubstr(R"(Assignment{
   Identifier[not set]{x_1}
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
 })"));
 }
 
@@ -344,7 +344,7 @@
     Identifier[not set]{myvar}
     Identifier[not set]{z}
   }
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
 })"));
 }
 
@@ -407,7 +407,7 @@
     Identifier[not set]{myvar}
     Identifier[not set]{x_11}
   }
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
 })"));
 }
 
@@ -442,7 +442,7 @@
   EXPECT_THAT(ToString(p->builder(), fe.ast_body()), HasSubstr(R"(Assignment{
   ArrayAccessor[not set]{
     Identifier[not set]{myvar}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   TypeConstructor[not set]{
     __vec_4__f32
@@ -485,7 +485,7 @@
   EXPECT_THAT(ToString(p->builder(), fe.ast_body()), HasSubstr(R"(Assignment{
   ArrayAccessor[not set]{
     Identifier[not set]{myvar}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   TypeConstructor[not set]{
     __vec_4__f32
@@ -688,7 +688,7 @@
       Identifier[not set]{myvar}
       Identifier[not set]{age}
     }
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   ScalarConstructor[not set]{42.000000}
 })"));
@@ -726,7 +726,7 @@
   MemberAccessor[not set]{
     ArrayAccessor[not set]{
       Identifier[not set]{myvar}
-      ScalarConstructor[not set]{2}
+      ScalarConstructor[not set]{2u}
     }
     Identifier[not set]{w}
   }
@@ -836,7 +836,7 @@
     Identifier[not set]{myvar}
     Identifier[not set]{field0}
   }
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Assignment{
   ArrayAccessor[not set]{
@@ -844,9 +844,9 @@
       Identifier[not set]{myvar}
       Identifier[not set]{field1}
     }
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 })"));
 }
 
@@ -878,7 +878,7 @@
     Identifier[not set]{myvar}
     Identifier[not set]{field0}
   }
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Assignment{
   ArrayAccessor[not set]{
@@ -886,9 +886,9 @@
       Identifier[not set]{myvar}
       Identifier[not set]{field1}
     }
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 })")) << got
       << p->error();
 }
@@ -918,9 +918,9 @@
       Identifier[not set]{myvar}
       Identifier[not set]{field1}
     }
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 })")) << p->error();
 }
 
@@ -956,14 +956,14 @@
           Identifier[not set]{myvar}
           Identifier[not set]{field1}
         }
-        ScalarConstructor[not set]{1}
+        ScalarConstructor[not set]{1u}
       }
     }
   }
 }
 Assignment{
   Identifier[not set]{x_2}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 })")) << p->error();
 }
 
@@ -999,8 +999,8 @@
   ASSERT_TRUE(p->BuildAndParseInternalModule()) << assembly << p->error();
   FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100));
   EXPECT_TRUE(fe.EmitBody()) << p->error();
-  EXPECT_THAT(ToString(p->builder(), fe.ast_body()),
-              Eq(R"(VariableDeclStatement{
+  EXPECT_EQ(ToString(p->builder(), fe.ast_body()),
+            R"(VariableDeclStatement{
   Variable{
     x_2
     function
@@ -1019,7 +1019,7 @@
           Identifier[not set]{myvar}
           Identifier[not set]{field1}
         }
-        ScalarConstructor[not set]{1}
+        ScalarConstructor[not set]{1u}
       }
     }
   }
@@ -1031,10 +1031,10 @@
 }
 Assignment{
   Identifier[not set]{x_2}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Return{}
-)")) << p->error();
+)") << p->error();
 }
 
 TEST_F(SpvParserTest, DISABLED_RemapStorageBuffer_ThroughFunctionCall) {