1 files changed, 1 insertions, 13 deletions
diff --git a/src/main/scala/firrtl/passes/ExpandWhens.scala b/src/main/scala/firrtl/passes/ExpandWhens.scala
index 6df7664b..921693c7 100644
--- a/src/main/scala/firrtl/passes/ExpandWhens.scala
+++ b/src/main/scala/firrtl/passes/ExpandWhens.scala
@@ -71,18 +71,6 @@ object ExpandWhens extends Pass {
     }
     expsx
   }
-  private def squashEmpty(s: Statement): Statement = {
-    s map squashEmpty match {
-      case Block(stmts) =>
-        val newStmts = stmts filter (_ != EmptyStmt)
-        newStmts.size match {
-          case 0 => EmptyStmt
-          case 1 => newStmts.head
-          case _ => Block(newStmts)
-        }
-      case s => s
-    }
-  }
   private def expandNetlist(netlist: LinkedHashMap[WrappedExpression, Expression]) =
     netlist map { case (k, v) =>
       v match {
@@ -191,7 +179,7 @@ object ExpandWhens extends Pass {
         case m: ExtModule => m
         case m: Module =>
         val (netlist, simlist, bodyx) = expandWhens(m)
-        val newBody = Block(Seq(bodyx map squashEmpty) ++ expandNetlist(netlist) ++ simlist)
+        val newBody = Block(Seq(squashEmpty(bodyx)) ++ expandNetlist(netlist) ++ simlist)
         Module(m.info, m.name, m.ports, newBody)
       }
     }