commit e07c40af14e1752f4afc6388986595a5de017054
author Ben Clayton <bclayton@google.com> Tue Mar 22 14:04:41 2022 +0000
committer Tint LUCI CQ <tint-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Mar 22 14:04:41 2022 +0000
tree a0e4c9808b9cb33e9df217f3a7835dc330ef97fb
parent 7d38b88d773beb9ec1d2e7842e4334969b2b8561

resolver: Fix ICE when using a builtin as a type

Bug: chromium:1308209
Change-Id: I779d7fcb4a32640663077cb2176875f6081098a0
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/84260
Reviewed-by: James Price <jrprice@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>

src/tint/resolver/resolver.cc

diff --git a/src/tint/resolver/resolver.cc b/src/tint/resolver/resolver.cc
index 5c7e36a..bb05c9d 100644
--- a/src/tint/resolver/resolver.cc
+++ b/src/tint/resolver/resolver.cc
@@ -275,6 +275,14 @@
               return nullptr;
             },
             [&](Default) {
+              if (auto* tn = ty->As<ast::TypeName>()) {
+                if (IsBuiltin(tn->name)) {
+                  auto name = builder_->Symbols().NameFor(tn->name);
+                  AddError("cannot use builtin '" + name + "' as type",
+                           ty->source);
+                  return nullptr;
+                }
+              }
               TINT_UNREACHABLE(Resolver, diagnostics_)
                   << "Unhandled resolved type '"
                   << (resolved ? resolved->TypeInfo().name : "<null>")