InferWidths now only fixes declaration widths

Then calls InferTypes to propagate inferred widths to expressions.
Required upgrading InferTypes to do simple width propagation.
Fixes #206  and #200.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/main/scala/firrtl/LoweringCompilers.scala b/src/main/scala/firrtl/LoweringCompilers.scala
index 8beaf7f9..6450aa66 100644
--- a/src/main/scala/firrtl/LoweringCompilers.scala
+++ b/src/main/scala/firrtl/LoweringCompilers.scala
@@ -111,9 +111,9 @@ class HighFirrtlToMiddleFirrtl () extends Transform with SimpleRun {
       passes.ConstProp,
       passes.ResolveKinds,
       passes.InferTypes,
-      passes.ResolveGenders)
-      //passes.InferWidths,
-      //passes.CheckWidths)
+      passes.ResolveGenders,
+      passes.InferWidths,
+      passes.CheckWidths)
    def execute (circuit: Circuit, annotationMap: AnnotationMap): TransformResult =
       run(circuit, passSeq)
 }