From 45bfe26f5f906c9c847ba2bd328413746a2c869c Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sun, 3 Mar 2013 13:18:37 +0100
Subject: [PATCH] Minor hotfixes (mostly gcc build fixes)

---
 kernel/select.cc              | 2 ++
 kernel/show.cc                | 2 ++
 libs/subcircuit/subcircuit.cc | 4 ++++
 passes/opt/opt_muxtree.cc     | 2 ++
 passes/opt/opt_rmunused.cc    | 2 ++
 5 files changed, 12 insertions(+)

diff --git a/kernel/select.cc b/kernel/select.cc
index f75737ad8..31c0d4883 100644
--- a/kernel/select.cc
+++ b/kernel/select.cc
@@ -22,6 +22,8 @@
 #include <string.h>
 #include <fnmatch.h>
 
+using RTLIL::id2cstr;
+
 static std::vector<RTLIL::Selection> work_stack;
 
 static bool match_ids(RTLIL::IdString id, std::string pattern)
diff --git a/kernel/show.cc b/kernel/show.cc
index 7c3f418b2..6db963b2a 100644
--- a/kernel/show.cc
+++ b/kernel/show.cc
@@ -23,6 +23,8 @@
 #include <string.h>
 #include <dirent.h>
 
+using RTLIL::id2cstr;
+
 #undef CLUSTER_CELLS_AND_PORTBOXES
 
 struct ShowWorker
diff --git a/libs/subcircuit/subcircuit.cc b/libs/subcircuit/subcircuit.cc
index 782040be6..2c6f3d827 100644
--- a/libs/subcircuit/subcircuit.cc
+++ b/libs/subcircuit/subcircuit.cc
@@ -1274,6 +1274,10 @@ class SubCircuit::SolverWorker
 			const std::string &graphId = graph_it.first;
 			const auto &graph = graph_it.second.graph;
 			int node2 = adj_it.first;
+
+			if (node1 == node2)
+				continue;
+
 			NodeSet pair(graphId, node1, node2);
 
 			if (usedPairs.count(pair) > 0)
diff --git a/passes/opt/opt_muxtree.cc b/passes/opt/opt_muxtree.cc
index 9d622d6a6..5602b5eea 100644
--- a/passes/opt/opt_muxtree.cc
+++ b/passes/opt/opt_muxtree.cc
@@ -27,6 +27,8 @@
 #include <stdio.h>
 #include <set>
 
+using RTLIL::id2cstr;
+
 struct OptMuxtreeWorker
 {
 	RTLIL::Design *design;
diff --git a/passes/opt/opt_rmunused.cc b/passes/opt/opt_rmunused.cc
index 9b2766440..4807a97b6 100644
--- a/passes/opt/opt_rmunused.cc
+++ b/passes/opt/opt_rmunused.cc
@@ -27,6 +27,8 @@
 #include <stdio.h>
 #include <set>
 
+using RTLIL::id2cstr;
+
 static CellTypes ct;
 
 static void rmunused_module_cells(RTLIL::Module *module)
-- 
2.30.2