commit efed88f512126582b9df364ff0301c1088782276
author Ryan Harrison <rharrison@chromium.org> Thu Oct 31 16:55:04 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Oct 31 16:55:04 2024 +0000
tree b22f387658cf1fcba03cd62a2183431730ca2708
parent 1c613525e6936b774af8c442ce9bb044ed9a4499

[tint][ir][val] Handle null types in lets when logging errors

Fixes: 376493191
Change-Id: I4cae624927a0e87096a03df217ae521460ca1506
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/213115
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: James Price <jrprice@google.com>
Auto-Submit: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: David Neto <dneto@google.com>

src/tint/lang/core/ir/validator.cc

diff --git a/src/tint/lang/core/ir/validator.cc b/src/tint/lang/core/ir/validator.cc
index 3720ffc..6cc6af1 100644
--- a/src/tint/lang/core/ir/validator.cc
+++ b/src/tint/lang/core/ir/validator.cc
@@ -2172,9 +2172,12 @@
 
     if (l->Result(0) && l->Value()) {
         if (l->Result(0)->Type() != l->Value()->Type()) {
-            AddError(l) << "result type " << style::Type(l->Result(0)->Type()->FriendlyName())
-                        << " does not match value type "
-                        << style::Type(l->Value()->Type()->FriendlyName());
+            auto result_type_name =
+                l->Result(0)->Type() ? l->Result(0)->Type()->FriendlyName() : "undef";
+            auto value_type_name =
+                l->Value()->Type() ? l->Value()->Type()->FriendlyName() : "undef";
+            AddError(l) << "result type " << style::Type(result_type_name)
+                        << " does not match value type " << style::Type(value_type_name);
         }
     }
 }
@@ -2390,8 +2393,8 @@
 
         auto* index = a->Indices()[i];
         if (DAWN_UNLIKELY(!index->Type() || !index->Type()->IsIntegerScalar())) {
-            err() << "index must be integer, got "
-                  << (index->Type() ? index->Type()->FriendlyName() : "undefined");
+            auto name = index->Type() ? index->Type()->FriendlyName() : "undef";
+            err() << "index must be integer, got " << name;
             return;
         }