From fc3587aa24132991a50fbba1fbe4dc769953a3db Mon Sep 17 00:00:00 2001
From: Andrew Waterman
Date: Sat, 16 Jan 2016 18:48:23 -0800
Subject: Disallow Muxing between bundles whose fields have different widths

---
 src/main/scala/Chisel/Bits.scala | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/main/scala/Chisel')

diff --git a/src/main/scala/Chisel/Bits.scala b/src/main/scala/Chisel/Bits.scala
index 7505c102..d6bef0d0 100644
--- a/src/main/scala/Chisel/Bits.scala
+++ b/src/main/scala/Chisel/Bits.scala
@@ -538,6 +538,9 @@ object Mux {
   // This returns an lvalue, which it most definitely should not
   private def doWhen[T <: Data](cond: Bool, con: T, alt: T): T = {
     require(con.getClass == alt.getClass, s"can't Mux between ${con.getClass} and ${alt.getClass}")
+    for ((c, a) <- con.flatten zip alt.flatten)
+      require(c.width == a.width, "can't Mux between aggregates of different width")
+
     val res = Wire(t = alt.cloneTypeWidth(con.width max alt.width), init = alt)
     when (cond) { res := con }
     res
-- 
cgit v1.2.3