Merge pull request #291 from ucb-bar/case_object_WVoid_WInvalid

Case object for WVoid WInvalid

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/scala/firrtl/passes/Passes.scala b/src/main/scala/firrtl/passes/Passes.scala
index 9057c60d..7f53fac8 100644
--- a/src/main/scala/firrtl/passes/Passes.scala
+++ b/src/main/scala/firrtl/passes/Passes.scala
@@ -200,9 +200,9 @@ object Legalize extends Pass {
     lazy val msb = width - 1
     if (amount >= width) {
       e.tpe match {
-        case UIntType(_) => UIntLiteral(0, IntWidth(1))
+        case UIntType(_) => zero
         case SIntType(_) =>
-          val bits = DoPrim(Bits, e.args, Seq(msb, msb), UIntType(IntWidth(1)))
+          val bits = DoPrim(Bits, e.args, Seq(msb, msb), BoolType)
           DoPrim(AsSInt, Seq(bits), Seq.empty, SIntType(IntWidth(1)))
         case t => error(s"Unsupported type ${t} for Primop Shift Right")
       }