Fixed a gcc vs. clang determinism problem in abc pass

diff --git a/passes/abc/abc.cc b/passes/abc/abc.cc
index ccf0fccb35099fbb5c14c4817655a2efe0c18846..9a13a446bf419fe38404317daea8c509b29f04fc 100644 (file)
--- a/passes/abc/abc.cc
+++ b/passes/abc/abc.cc
@@ -123,12 +123,15 @@ static void extract_cell(RTLIL::Cell *cell)
                assign_map.apply(sig_b);
                assign_map.apply(sig_y);
 
+               int mapped_a = map_signal(sig_a);
+               int mapped_b = map_signal(sig_b);
+
                if (cell->type == "$_AND_")
-                       map_signal(sig_y, 'a', map_signal(sig_a), map_signal(sig_b));
+                       map_signal(sig_y, 'a', mapped_a, mapped_b);
                else if (cell->type == "$_OR_")
-                       map_signal(sig_y, 'o', map_signal(sig_a), map_signal(sig_b));
+                       map_signal(sig_y, 'o', mapped_a, mapped_b);
                else if (cell->type == "$_XOR_")
-                       map_signal(sig_y, 'x', map_signal(sig_a), map_signal(sig_b));
+                       map_signal(sig_y, 'x', mapped_a, mapped_b);
                else
                        abort();
 
@@ -149,7 +152,11 @@ static void extract_cell(RTLIL::Cell *cell)
                assign_map.apply(sig_s);
                assign_map.apply(sig_y);
 
-               map_signal(sig_y, 'm', map_signal(sig_a), map_signal(sig_b), map_signal(sig_s));
+               int mapped_a = map_signal(sig_a);
+               int mapped_b = map_signal(sig_b);
+               int mapped_s = map_signal(sig_s);
+
+               map_signal(sig_y, 'm', mapped_a, mapped_b, mapped_s);
 
                module->cells.erase(cell->name);
                delete cell;