commit 11ed0db30dba4759436d75f7e28bd0c09c2d0e7d
author Ben Clayton <bclayton@google.com> Thu Oct 14 20:30:29 2021 +0000
committer Tint LUCI CQ <tint-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Oct 14 20:30:29 2021 +0000
tree 808295de19ec69e9fa2322ff653320c7f09430f4
parent 262210f12bb311fe775ca2c25513c32beae8b951

resolver: Don't use ast to_str() methods

These return weird names that love the use of '__' and have little relation to WGSL.

Improve the duplicate case error message.

Clean up control_block_validation_test.cc by making used of the ProgramBuilder helpers.

Bug: tint:1225
Change-Id: I8c4cf3943145cf8372c00d33ae0166c0c0bcbb8b
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/66442
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Reviewed-by: James Price <jrprice@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>

src/resolver/resolver.cc

diff --git a/src/resolver/resolver.cc b/src/resolver/resolver.cc
index a9ab165..cc64de0 100644
--- a/src/resolver/resolver.cc
+++ b/src/resolver/resolver.cc
@@ -273,12 +273,10 @@
   bool result = true;
   for (auto* node : builder_->ASTNodes().Objects()) {
     if (marked_.count(node) == 0) {
-      TINT_ICE(Resolver, diagnostics_)
-          << "AST node '" << node->TypeInfo().name
-          << "' was not reached by the resolver\n"
-          << "At: " << node->source() << "\n"
-          << "Content: " << builder_->str(node) << "\n"
-          << "Pointer: " << node;
+      TINT_ICE(Resolver, diagnostics_) << "AST node '" << node->TypeInfo().name
+                                       << "' was not reached by the resolver\n"
+                                       << "At: " << node->source() << "\n"
+                                       << "Pointer: " << node;
       result = false;
     }
   }
@@ -2123,9 +2121,9 @@
     return VariableDeclStatement(v);
   }
 
-  AddError(
-      "unknown statement type for type determination: " + builder_->str(stmt),
-      stmt->source());
+  AddError("unknown statement type for type determination: " +
+               std::string(stmt->TypeInfo().name),
+           stmt->source());
   return false;
 }
 
@@ -4389,7 +4387,7 @@
   }
 
   bool has_default = false;
-  std::unordered_set<uint32_t> selector_set;
+  std::unordered_map<uint32_t, Source> selectors;
 
   for (auto* case_stmt : s->body()) {
     if (case_stmt->IsDefault()) {
@@ -4412,15 +4410,16 @@
       }
 
       auto v = selector->value_as_u32();
-      if (selector_set.find(v) != selector_set.end()) {
-        AddError(
-            "a literal value must not appear more than once in "
-            "the case selectors for a switch statement: '" +
-                builder_->str(selector) + "'",
-            case_stmt->source());
+      auto it = selectors.find(v);
+      if (it != selectors.end()) {
+        auto val = selector->Is<ast::IntLiteral>()
+                       ? std::to_string(selector->value_as_i32())
+                       : std::to_string(selector->value_as_u32());
+        AddError("duplicate switch case '" + val + "'", selector->source());
+        AddNote("previous case declared here", it->second);
         return false;
       }
-      selector_set.emplace(v);
+      selectors.emplace(v, selector->source());
     }
   }
 
@@ -4659,7 +4658,6 @@
       << "AST node '" << node->TypeInfo().name
       << "' was encountered twice in the same AST of a Program\n"
       << "At: " << node->source() << "\n"
-      << "Content: " << builder_->str(node) << "\n"
       << "Pointer: " << node;
 }