From: whitequark <whitequark@whitequark.org>
Date: Wed, 17 Jun 2020 19:27:47 +0000 (+0000)
Subject: cxxrtl: don't compute vital values in log_assert().
X-Git-Tag: working-ls180~465^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3c4e974d7b05d69c620ed76b8a23b461bf99eee6;p=yosys.git

cxxrtl: don't compute vital values in log_assert().

This breaks NDEBUG builds.

Fixes #2166.
---

diff --git a/backends/cxxrtl/cxxrtl_backend.cc b/backends/cxxrtl/cxxrtl_backend.cc
index 909e1325d..58660fb37 100644
--- a/backends/cxxrtl/cxxrtl_backend.cc
+++ b/backends/cxxrtl/cxxrtl_backend.cc
@@ -1839,7 +1839,8 @@ struct CxxrtlWorker {
 				topo_design.edge(cell_module, module);
 			}
 		}
-		log_assert(topo_design.sort());
+		bool no_loops = topo_design.sort();
+		log_assert(no_loops);
 		modules.insert(modules.end(), topo_design.sorted.begin(), topo_design.sorted.end());
 
 		if (split_intf) {