From 5878c08b46b2520760800db73e0ef4b21f173f46 Mon Sep 17 00:00:00 2001
From: jackkoenig
Date: Thu, 8 Sep 2016 17:08:45 -0700
Subject: Revert Expand Whens to process a set of connection lhs

---
 src/main/scala/firrtl/passes/ExpandWhens.scala | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/main')

diff --git a/src/main/scala/firrtl/passes/ExpandWhens.scala b/src/main/scala/firrtl/passes/ExpandWhens.scala
index 7c013b51..dcefb20f 100644
--- a/src/main/scala/firrtl/passes/ExpandWhens.scala
+++ b/src/main/scala/firrtl/passes/ExpandWhens.scala
@@ -114,7 +114,9 @@ object ExpandWhens extends Pass {
           val conseqStmt = expandWhens(conseqNetlist, netlist +: defaults, AND(p, s.pred))(s.conseq)
           val altStmt = expandWhens(altNetlist, netlist +: defaults, AND(p, NOT(s.pred)))(s.alt)
 
-          val memos = (conseqNetlist.keys ++ altNetlist.keys) map { lvalue =>
+          // Process combined set of keys because we only want to create 1 mux for each node
+          //   being connected to in the conseq and/or alt
+          val memos = (conseqNetlist.keySet ++ altNetlist.keySet) map { lvalue =>
             // Defaults in netlist get priority over those in defaults
             val default = netlist get lvalue match {
               case Some(v) => Some(v)
-- 
cgit v1.2.3