From 23f1b8d1f9f94975fb5b4fe22f15343d853808d9 Mon Sep 17 00:00:00 2001
From: Adam Izraelevitz
Date: Fri, 12 May 2017 13:59:36 -0700
Subject: Bugfix: renaming instance ports was broken. (#588)

---
 src/main/scala/firrtl/passes/LowerTypes.scala | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main')

diff --git a/src/main/scala/firrtl/passes/LowerTypes.scala b/src/main/scala/firrtl/passes/LowerTypes.scala
index 6b1b5d66..663241d3 100644
--- a/src/main/scala/firrtl/passes/LowerTypes.scala
+++ b/src/main/scala/firrtl/passes/LowerTypes.scala
@@ -45,16 +45,16 @@ object LowerTypes extends Transform {
   def renameExps(renames: RenameMap, e: Expression, root: String): Seq[String] = e.tpe match {
     case (_: GroundType) =>
       val name = root + loweredName(e)
-      renames.rename(e.serialize, name)
+      renames.rename(root + e.serialize, name)
       Seq(name)
     case (t: BundleType) => t.fields.foldLeft(Seq[String]()){(names, f) =>
       val subNames = renameExps(renames, WSubField(e, f.name, f.tpe, times(gender(e), f.flip)), root)
-      renames.rename(e.serialize, subNames)
+      renames.rename(root + e.serialize, subNames)
       names ++ subNames
     }
     case (t: VectorType) => (0 until t.size).foldLeft(Seq[String]()){(names, i) =>
       val subNames = renameExps(renames, WSubIndex(e, i, t.tpe,gender(e)), root)
-      renames.rename(e.serialize, subNames)
+      renames.rename(root + e.serialize, subNames)
       names ++ subNames
     }
   }
@@ -189,7 +189,7 @@ object LowerTypes extends Transform {
       case sx: WDefInstance => sx.tpe match {
         case t: BundleType =>
           val fieldsx = t.fields flatMap { f =>
-            renameExps(renames, f.name, sx.tpe, s"${sx.name}.")
+            renameExps(renames, f.name, f.tpe, s"${sx.name}.")
             create_exps(WRef(f.name, f.tpe, ExpKind, times(f.flip, MALE))) map { e => 
               // Flip because inst genders are reversed from Module type
               Field(loweredName(e), swap(to_flip(gender(e))), e.tpe)
-- 
cgit v1.2.3