From 087b15bdb330426938b9f93e5e702d6dd34b979f Mon Sep 17 00:00:00 2001 From: Geza Lore Date: Wed, 26 Aug 2026 10:55:36 +0200 Subject: [PATCH] Remove source location from DIDNOTCONVERGE error (#8225 prep) (#8227) --- docs/gen/ex_DIDNOTCONVERGE_msg.rst | 2 +- docs/gen/ex_DIDNOTCONVERGE_nodbg_msg.rst | 2 +- src/V3SchedUtil.cpp | 6 +----- test_regress/t/t_lint_didnotconverge_bad.out | 2 +- test_regress/t/t_lint_didnotconverge_nodbg_bad.out | 2 +- test_regress/t/t_unopt_converge_initial_run_bad.out | 2 +- test_regress/t/t_unopt_converge_ndbg_bad.out | 2 +- test_regress/t/t_unopt_converge_print_bad.out | 2 +- test_regress/t/t_unopt_converge_run_bad.out | 2 +- 9 files changed, 9 insertions(+), 13 deletions(-) diff --git a/docs/gen/ex_DIDNOTCONVERGE_msg.rst b/docs/gen/ex_DIDNOTCONVERGE_msg.rst index ad1f821c5..8680d086d 100644 --- a/docs/gen/ex_DIDNOTCONVERGE_msg.rst +++ b/docs/gen/ex_DIDNOTCONVERGE_msg.rst @@ -2,4 +2,4 @@ .. code-block:: -V{t#,#} 'stl' region trigger index 0 is active: @([hybrid] a) - %Error-DIDNOTCONVERGE: t/t_lint_didnotconverge_bad.v:7: Settle region did not converge after '--converge-limit' of 10000 tries + %Error-DIDNOTCONVERGE: Settle region did not converge after '--converge-limit' of 10000 tries diff --git a/docs/gen/ex_DIDNOTCONVERGE_nodbg_msg.rst b/docs/gen/ex_DIDNOTCONVERGE_nodbg_msg.rst index ccee67b21..23caf8453 100644 --- a/docs/gen/ex_DIDNOTCONVERGE_nodbg_msg.rst +++ b/docs/gen/ex_DIDNOTCONVERGE_nodbg_msg.rst @@ -1,4 +1,4 @@ .. comment: generated by t_lint_didnotconverge_nodbg_bad .. code-block:: - %Error-DIDNOTCONVERGE: t/t_lint_didnotconverge_bad.v:7: Settle region did not converge after '--converge-limit' of 10000 tries + %Error-DIDNOTCONVERGE: Settle region did not converge after '--converge-limit' of 10000 tries diff --git a/src/V3SchedUtil.cpp b/src/V3SchedUtil.cpp index 0d7ec5ec7..844063bb3 100644 --- a/src/V3SchedUtil.cpp +++ b/src/V3SchedUtil.cpp @@ -92,11 +92,7 @@ AstNodeStmt* checkIterationLimit(AstNetlist* netlistp, const string& name, AstVa if (dumpCallp) ifp->addThensp(dumpCallp); AstCStmt* const stmtp = new AstCStmt{flp}; ifp->addThensp(stmtp); - const FileLine* const locp = netlistp->topModulep()->fileline(); - const std::string& file = VIdProtect::protect(locp->filename()); - const std::string& line = std::to_string(locp->lineno()); - stmtp->add("VL_FATAL_MT(\"" + V3OutFormatter::quoteNameControls(file) + "\", " + line - + ", \"\", \"DIDNOTCONVERGE: " + name + stmtp->add("VL_FATAL_MT(\"\", 0, \"\", \"DIDNOTCONVERGE: " + name + " region did not converge after '--converge-limit' of " + std::to_string(limit) + " tries\");"); return ifp; diff --git a/test_regress/t/t_lint_didnotconverge_bad.out b/test_regress/t/t_lint_didnotconverge_bad.out index 354730a84..ab9f6ae30 100644 --- a/test_regress/t/t_lint_didnotconverge_bad.out +++ b/test_regress/t/t_lint_didnotconverge_bad.out @@ -1,3 +1,3 @@ -V{t#,#} 'stl' region trigger index 0 is active: @([hybrid] a) -%Error-DIDNOTCONVERGE: t/t_lint_didnotconverge_bad.v:7: Settle region did not converge after '--converge-limit' of 10000 tries +%Error-DIDNOTCONVERGE: Settle region did not converge after '--converge-limit' of 10000 tries Aborting... diff --git a/test_regress/t/t_lint_didnotconverge_nodbg_bad.out b/test_regress/t/t_lint_didnotconverge_nodbg_bad.out index 71380e6df..66048c649 100644 --- a/test_regress/t/t_lint_didnotconverge_nodbg_bad.out +++ b/test_regress/t/t_lint_didnotconverge_nodbg_bad.out @@ -1,2 +1,2 @@ -%Error-DIDNOTCONVERGE: t/t_lint_didnotconverge_bad.v:7: Settle region did not converge after '--converge-limit' of 10000 tries +%Error-DIDNOTCONVERGE: Settle region did not converge after '--converge-limit' of 10000 tries Aborting... diff --git a/test_regress/t/t_unopt_converge_initial_run_bad.out b/test_regress/t/t_unopt_converge_initial_run_bad.out index b55b359ae..26635dae4 100644 --- a/test_regress/t/t_unopt_converge_initial_run_bad.out +++ b/test_regress/t/t_unopt_converge_initial_run_bad.out @@ -1,3 +1,3 @@ -V{t#,#} 'stl' region trigger index 0 is active: @([hybrid] x) -%Error-DIDNOTCONVERGE: t/t_unopt_converge_initial.v:7: Settle region did not converge after '--converge-limit' of 10000 tries +%Error-DIDNOTCONVERGE: Settle region did not converge after '--converge-limit' of 10000 tries Aborting... diff --git a/test_regress/t/t_unopt_converge_ndbg_bad.out b/test_regress/t/t_unopt_converge_ndbg_bad.out index a4e2b86ed..66048c649 100644 --- a/test_regress/t/t_unopt_converge_ndbg_bad.out +++ b/test_regress/t/t_unopt_converge_ndbg_bad.out @@ -1,2 +1,2 @@ -%Error-DIDNOTCONVERGE: t/t_unopt_converge.v:7: Settle region did not converge after '--converge-limit' of 10000 tries +%Error-DIDNOTCONVERGE: Settle region did not converge after '--converge-limit' of 10000 tries Aborting... diff --git a/test_regress/t/t_unopt_converge_print_bad.out b/test_regress/t/t_unopt_converge_print_bad.out index dff73fb66..26635dae4 100644 --- a/test_regress/t/t_unopt_converge_print_bad.out +++ b/test_regress/t/t_unopt_converge_print_bad.out @@ -1,3 +1,3 @@ -V{t#,#} 'stl' region trigger index 0 is active: @([hybrid] x) -%Error-DIDNOTCONVERGE: t/t_unopt_converge.v:7: Settle region did not converge after '--converge-limit' of 10000 tries +%Error-DIDNOTCONVERGE: Settle region did not converge after '--converge-limit' of 10000 tries Aborting... diff --git a/test_regress/t/t_unopt_converge_run_bad.out b/test_regress/t/t_unopt_converge_run_bad.out index 7d2e6d461..cf98c21c5 100644 --- a/test_regress/t/t_unopt_converge_run_bad.out +++ b/test_regress/t/t_unopt_converge_run_bad.out @@ -1,3 +1,3 @@ -V{t#,#} 'stl' region trigger index 0 is active: @([hybrid] x) -%Error-DIDNOTCONVERGE: t/t_unopt_converge.v:7: Settle region did not converge after '--converge-limit' of 5 tries +%Error-DIDNOTCONVERGE: Settle region did not converge after '--converge-limit' of 5 tries Aborting...