From c2116dcc45e4916a99515c99f654ce2429d0d839 Mon Sep 17 00:00:00 2001
From: Andrew Waterman
Date: Wed, 29 Jul 2015 18:44:33 -0700
Subject: Remove nondeterminism in field naming

We must compensate for Class.getMethod's nondeterministic ordering.
---
 src/main/scala/Chisel/Core.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main/scala/Chisel/Core.scala b/src/main/scala/Chisel/Core.scala
index 7ba4444c..dd0799d8 100644
--- a/src/main/scala/Chisel/Core.scala
+++ b/src/main/scala/Chisel/Core.scala
@@ -963,7 +963,7 @@ class Bundle(dirArg: Direction = NO_DIR) extends Aggregate(dirArg) {
         }
       }
     }
-    elts sortWith (_._2._id > _._2._id)
+    elts sortWith {case ((an, a), (bn, b)) => (a._id > b._id) || ((a eq b) && (an > bn))}
   }
   override def collectElts =
     sortedElts.foreach(e => setFieldForId(cid, e._2.cid, e._1))
-- 
cgit v1.2.3