qbfsat: Make hole name recovery more robust. Allow multiple cell types to share the...

diff --git a/passes/sat/qbfsat.cc b/passes/sat/qbfsat.cc
index 981271770df31f1f166cf3e3d7228265da4f4ffe..e9b4913cda80fceff1aedaba42ff23328bab10b7 100644 (file)
--- a/passes/sat/qbfsat.cc
+++ b/passes/sat/qbfsat.cc
@@ -98,11 +98,8 @@ dict<std::string, std::string> get_hole_loc_name_map(RTLIL::Module *module, cons
        for (auto cell : module->cells()) {
                std::string cell_src = cell->get_src_attribute();
                auto pos = sol.hole_to_value.find(cell_src);
-               if (pos != sol.hole_to_value.end()) {
-#ifndef NDEBUG
-                       log_assert(cell->type.in("$anyconst", "$anyseq"));
-                       log_assert(cell->getPort(ID::Y).is_wire());
-#endif
+               if (pos != sol.hole_to_value.end() && cell->type.in("$anyconst", "$anyseq")) {
+                       log_assert(hole_loc_to_name.find(pos->first) == hole_loc_to_name.end());
                        hole_loc_to_name[pos->first] = cell->getPort(ID::Y).as_wire()->name.str();
                }
        }