commit b82acac68ebc2294b2a5155e0f2b7f0609e515b4
author Ben Clayton <bclayton@google.com> Thu May 06 16:04:03 2021 +0000
committer Commit Bot service account <commit-bot@chromium.org> Thu May 06 16:04:03 2021 +0000
tree a8afeff5511d1471319e8297978af856ad8c793d
parent 060079609226fc3f1bcb1f91b074f8b3f6e9d5ad

Resolver: Clean up diagnostics

Don't have a separate diagnostic list, just put the errors straight into the ProgramBuilder's diagnostics.
This also fixes an issue where we were taking the stringified diagnostic list and creating a single error on resolution failure. This was the cause of the `error: error:` messages sometimes seen.

Also fix a stupid negated-logic bug around the "resolving failed, but no error was raised" ICE.

Change-Id: Iddf1f61e4be21137731dfc204210562abbf612b0
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/49963
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: James Price <jrprice@google.com>

src/program.cc

diff --git a/src/program.cc b/src/program.cc
index 9029bb5..dff5616 100644
--- a/src/program.cc
+++ b/src/program.cc
@@ -45,7 +45,6 @@
   if (builder.ResolveOnBuild() && builder.IsValid()) {
     resolver::Resolver resolver(&builder);
     if (!resolver.Resolve()) {
-      diagnostics_.add_error(resolver.error());
       is_valid_ = false;
     }
   }

src/resolver/resolver.cc

diff --git a/src/resolver/resolver.cc b/src/resolver/resolver.cc
index 9779c40..b46e4fe 100644
--- a/src/resolver/resolver.cc
+++ b/src/resolver/resolver.cc
@@ -124,7 +124,9 @@
 }  // namespace
 
 Resolver::Resolver(ProgramBuilder* builder)
-    : builder_(builder), intrinsic_table_(IntrinsicTable::Create()) {}
+    : builder_(builder),
+      diagnostics_(builder->Diagnostics()),
+      intrinsic_table_(IntrinsicTable::Create()) {}
 
 Resolver::~Resolver() = default;
 
@@ -158,7 +160,7 @@
 
   bool result = ResolveInternal();
 
-  if (result && diagnostics_.contains_errors()) {
+  if (!result && !diagnostics_.contains_errors()) {
     TINT_ICE(diagnostics_) << "resolving failed, but no error was raised";
     return false;
   }

src/resolver/resolver.h

diff --git a/src/resolver/resolver.h b/src/resolver/resolver.h
index 1780cb8..4426138 100644
--- a/src/resolver/resolver.h
+++ b/src/resolver/resolver.h
@@ -360,8 +360,8 @@
   void Mark(const ast::Node* node);
 
   ProgramBuilder* const builder_;
+  diag::List& diagnostics_;
   std::unique_ptr<IntrinsicTable> const intrinsic_table_;
-  diag::List diagnostics_;
   BlockInfo* current_block_ = nullptr;
   ScopeStack<VariableInfo*> variable_stack_;
   std::unordered_map<Symbol, FunctionInfo*> symbol_to_function_;