fhdl.visit: fix nondeterminism in visit_Case.

str(value) serializes to e.g. <Constant object at 0x7f3f94f346d8>, which is randomized due to ASLR even with e.g. PYTHONHASHSEED set.
m-labs · Oct 9, 2018 · 076ec0d · 076ec0d
1 parent 1e114c7
commit 076ec0d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/migen/fhdl/visit.py b/migen/fhdl/visit.py
@@ -83,7 +83,7 @@ def visit_If(self, node):
     def visit_Case(self, node):
         self.visit(node.test)
         for v, statements in sorted(node.cases.items(),
-                                    key=lambda x: str(x[0])):
+                                    key=lambda x: -1 if x[0] is "default" else x[0].duid):
             self.visit(statements)
 
     def visit_Fragment(self, node):
@@ -188,7 +188,7 @@ def visit_If(self, node):
     def visit_Case(self, node):
         cases = {v: self.visit(statements)
                  for v, statements in sorted(node.cases.items(),
-                                             key=lambda x: str(x[0]))}
+                                             key=lambda x: -1 if x[0] is "default" else x[0].duid)}
         r = Case(self.visit(node.test), cases)
         return r