Minor hotfixes (mostly gcc build fixes)

diff --git a/kernel/select.cc b/kernel/select.cc
index f75737ad83c5d16a0c948cc56c888bc622bb1415..31c0d488317187db95cd7673268dc2037e8a02bb 100644 (file)
--- 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 7c3f418b260e12903233e7420571b91296332085..6db963b2ab1a189fbb201b6a6ab76a23ef357d3f 100644 (file)
--- 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 782040be68da88870fdd1fab5453a583aee87ebe..2c6f3d827d8faf0b18976b048deef81c8a33edf7 100644 (file)
--- 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 9d622d6a6e95ee6a9ccd20e2b07f08c14cc6467f..5602b5eea61dd071daee9ee95ca7301add51858e 100644 (file)
--- 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 9b2766440f363c8f2403a85d4459079b255fc980..4807a97b6a4fd03e0df9fe5790e38ac61e3076a8 100644 (file)
--- 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)