Clean initial diagnostic reporting

povik · Nov 21, 2024 · b8ea856 · b8ea856
1 parent 1655102
commit b8ea856
Showing 1 changed file with 4 additions and 17 deletions.
diff --git a/src/slang_frontend.cc b/src/slang_frontend.cc
@@ -2390,15 +2390,9 @@ struct PopulateNetlist : public TimingPatternInterpretor, public ast::ASTVisitor
 			return;
 
 		auto result = body.visit(initial_eval);
-		if (result != ast::Statement::EvalResult::Success) {
-			for (auto& diag_ : initial_eval.context.getAllDiagnostics())
-    			global_diagengine->issue(diag_);
-    		global_diagengine->issue(slang::Diagnostic(diag::NoteIgnoreInitial,
-													slang::SourceLocation::NoLocation));
-			auto str = global_diagclient->getString();
-			log_error("Failed to execute initial block\n%s\n",
-					  str.c_str());
-		}
+		if (result != ast::Statement::EvalResult::Success)
+    		initial_eval.context.addDiag(diag::NoteIgnoreInitial,
+    									 slang::SourceLocation::NoLocation);
 	}
 
 	void handle(const ast::ProceduralBlockSymbol &symbol)
@@ -2892,14 +2886,7 @@ struct PopulateNetlist : public TimingPatternInterpretor, public ast::ASTVisitor
 		});
 		sym.visit(inittransfer);
 
-		for (auto& diag : initial_eval.context.getAllDiagnostics())
-        	global_diagengine->issue(diag);
-		auto str = global_diagclient->getString();
-		if (global_diagengine->getNumErrors())
-			log_error("%s", str.c_str());
-		else
-			log("%s", str.c_str());
-		global_diagclient->clear();
+		initial_eval.context.reportAllDiags();
 	}
 
 	void handle(const ast::UninstantiatedDefSymbol &sym)