From 803ccfb1bc44dba88edf0ae9755ec13cbc9192d9 Mon Sep 17 00:00:00 2001
From: azidar
Date: Thu, 18 Aug 2016 17:27:12 -0700
Subject: Fixed bug where nodes of Invalids where created

---
 src/main/scala/firrtl/passes/ExpandWhens.scala | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/main/scala/firrtl/passes/ExpandWhens.scala b/src/main/scala/firrtl/passes/ExpandWhens.scala
index dcefb20f..5a7a7bac 100644
--- a/src/main/scala/firrtl/passes/ExpandWhens.scala
+++ b/src/main/scala/firrtl/passes/ExpandWhens.scala
@@ -137,15 +137,20 @@ object ExpandWhens extends Pass {
                 conseqNetlist getOrElse (lvalue, altNetlist(lvalue))
             }
 
-            nodes get res match {
-              case Some(name) =>
-                netlist(lvalue) = WRef(name, res.tpe, NodeKind(), MALE)
+            res match {
+              case _: ValidIf | _: Mux | _: DoPrim => nodes get res match {
+                case Some(name) =>
+                  netlist(lvalue) = WRef(name, res.tpe, NodeKind(), MALE)
+                  EmptyStmt
+                case None =>
+                  val name = namespace.newTemp
+                  nodes(res) = name
+                  netlist(lvalue) = WRef(name, res.tpe, NodeKind(), MALE)
+                  DefNode(s.info, name, res)
+              }
+              case _ =>
+                netlist(lvalue) = res
                 EmptyStmt
-              case None =>
-                val name = namespace.newTemp
-                nodes(res) = name
-                netlist(lvalue) = WRef(name, res.tpe, NodeKind(), MALE)
-                DefNode(s.info, name, res)
             }
           }
           Block(Seq(conseqStmt, altStmt) ++ memos)
-- 
cgit v1.2.3