commit 7dc823b552f1000fd53963bdc38f7af5f8a01389
author Tint team <no-reply@google.com> Wed Apr 20 23:17:56 2022 +0000
committer Tint LUCI CQ <tint-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Apr 20 23:17:56 2022 +0000
tree 09364a746b75c8cd2f804355a73f1f0fd98e21a7
parent d7f9233945a86ae3356fe28edb02966ec56f401c

Import Tint changes from Dawn

Changes:
  - b6f4c598459b7b20dfbce1cea104d3eb22919b67 tint: Fix Matrix::FriendlyName() for inferred type by James Price <jrprice@google.com>
  - fb5a4927870d47a1a05110b5aa9f57c1e1109c8d Fix inclusive language presubmit by dan sinclair <dsinclair@chromium.org>
GitOrigin-RevId: b6f4c598459b7b20dfbce1cea104d3eb22919b67
Change-Id: If245ff5f0adaca24e2480afa5f73d49bbfe8ede0
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/87461
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>

src/tint/ast/matrix.cc

diff --git a/src/tint/ast/matrix.cc b/src/tint/ast/matrix.cc
index b9baa27..8ad2b8a 100644
--- a/src/tint/ast/matrix.cc
+++ b/src/tint/ast/matrix.cc
@@ -39,8 +39,10 @@
 
 std::string Matrix::FriendlyName(const SymbolTable& symbols) const {
   std::ostringstream out;
-  out << "mat" << columns << "x" << rows << "<" << type->FriendlyName(symbols)
-      << ">";
+  out << "mat" << columns << "x" << rows;
+  if (type) {
+    out << "<" << type->FriendlyName(symbols) << ">";
+  }
   return out.str();
 }
 

src/tint/ast/matrix_test.cc

diff --git a/src/tint/ast/matrix_test.cc b/src/tint/ast/matrix_test.cc
index 54c11eb..216408f 100644
--- a/src/tint/ast/matrix_test.cc
+++ b/src/tint/ast/matrix_test.cc
@@ -46,5 +46,10 @@
   EXPECT_EQ(m->FriendlyName(Symbols()), "mat2x3<i32>");
 }
 
+TEST_F(AstMatrixTest, FriendlyName_WithoutType) {
+  auto* m = create<Matrix>(nullptr, 3, 2);
+  EXPECT_EQ(m->FriendlyName(Symbols()), "mat2x3");
+}
+
 }  // namespace
 }  // namespace tint::ast

src/tint/reader/spirv/parser_impl_module_var_test.cc

diff --git a/src/tint/reader/spirv/parser_impl_module_var_test.cc b/src/tint/reader/spirv/parser_impl_module_var_test.cc
index c8f6935..443e836 100644
--- a/src/tint/reader/spirv/parser_impl_module_var_test.cc
+++ b/src/tint/reader/spirv/parser_impl_module_var_test.cc
@@ -3410,8 +3410,8 @@
 
     %300 = OpFunction %void None %voidfn
     %entry_300 = OpLabel
-    %dummy_300_1 = OpFunctionCall %void %100
-    %dummy_300_2 = OpFunctionCall %void %200
+    %placeholder_300_1 = OpFunctionCall %void %100
+    %placeholder_300_2 = OpFunctionCall %void %200
     OpReturn
     OpFunctionEnd
 
@@ -3424,21 +3424,21 @@
     ; Call %100
     %1100 = OpFunction %void None %voidfn
     %entry_1100 = OpLabel
-    %dummy_1100_1 = OpFunctionCall %void %100
+    %placeholder_1100_1 = OpFunctionCall %void %100
     OpReturn
     OpFunctionEnd
 
     ; Call %200
     %1200 = OpFunction %void None %voidfn
     %entry_1200 = OpLabel
-    %dummy_1200_1 = OpFunctionCall %void %200
+    %placeholder_1200_1 = OpFunctionCall %void %200
     OpReturn
     OpFunctionEnd
 
     ; Call %300
     %1300 = OpFunction %void None %voidfn
     %entry_1300 = OpLabel
-    %dummy_1300_1 = OpFunctionCall %void %300
+    %placeholder_1300_1 = OpFunctionCall %void %300
     OpReturn
     OpFunctionEnd