From: Eddie Hung <eddie@fpgeh.com>
Date: Thu, 27 Jun 2019 22:29:20 +0000 (-0700)
Subject: Do not use Module::remove() iterator version
X-Git-Tag: working-ls180~1237^2~12
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a625854ac5e2ff3d6bf11e97b7ac676b362e7461;p=yosys.git

Do not use Module::remove() iterator version
---

diff --git a/passes/techmap/abc9.cc b/passes/techmap/abc9.cc
index e2a82f0c8..3721b82b7 100644
--- a/passes/techmap/abc9.cc
+++ b/passes/techmap/abc9.cc
@@ -555,17 +555,18 @@ void abc9_module(RTLIL::Design *design, RTLIL::Module *current_module, std::stri
 
 		dict<IdString, bool> abc_box;
 		vector<RTLIL::Cell*> boxes;
-		for (auto cell : module->cells()) {
+		for (const auto &it : module->cells_) {
+			auto cell = it.second;
 			if (cell->type.in("$_AND_", "$_NOT_")) {
 				module->remove(cell);
 				continue;
 			}
-			auto it = abc_box.find(cell->type);
-			if (it == abc_box.end()) {
+			auto jt = abc_box.find(cell->type);
+			if (jt == abc_box.end()) {
 				RTLIL::Module* box_module = design->module(cell->type);
-				it = abc_box.insert(std::make_pair(cell->type, box_module && box_module->attributes.count("\\abc_box_id"))).first;
+				jt = abc_box.insert(std::make_pair(cell->type, box_module && box_module->attributes.count("\\abc_box_id"))).first;
 			}
-			if (it->second)
+			if (jt->second)
 				boxes.emplace_back(cell);
 		}