diff options
| author | Albert Chen | 2019-07-21 14:14:11 -0700 |
|---|---|---|
| committer | mergify[bot] | 2019-07-21 21:14:11 +0000 |
| commit | 73d02043de4987025f454244aee95a0ece470f59 (patch) | |
| tree | 580a1e5e74aeb2fec1063f24a54eaa9b03372351 /src/main | |
| parent | 71d52cecde697d0734d55694e2344c2fb7e55cbe (diff) | |
Fix RenameMap chaining (#1126)
* fix RenameMap chaining
* fix order of chaining, add another test case
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/scala/firrtl/RenameMap.scala | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/main/scala/firrtl/RenameMap.scala b/src/main/scala/firrtl/RenameMap.scala index 30ad5a2f..825b0098 100644 --- a/src/main/scala/firrtl/RenameMap.scala +++ b/src/main/scala/firrtl/RenameMap.scala @@ -40,7 +40,13 @@ final class RenameMap private (val underlying: mutable.HashMap[CompleteTarget, S /** Chain a [[RenameMap]] with this [[RenameMap]] * @param next the map to chain with this map */ - def andThen(next: RenameMap) = new RenameMap(next.underlying, chained = Some(this)) + def andThen(next: RenameMap): RenameMap = { + if (next.chained.isEmpty) { + new RenameMap(next.underlying, chained = Some(this)) + } else { + new RenameMap(next.underlying, chained = next.chained.map(this.andThen(_))) + } + } /** Record that the from [[firrtl.annotations.CircuitTarget CircuitTarget]] is renamed to another * [[firrtl.annotations.CircuitTarget CircuitTarget]] @@ -204,8 +210,10 @@ final class RenameMap private (val underlying: mutable.HashMap[CompleteTarget, S if (chainedRet.isEmpty) { Some(chainedRet) } else { - val hereRet = chainedRet.flatMap(hereCompleteGet) - if (hereRet.isEmpty) { None } else { Some(hereRet.flatten) } + val hereRet = (chainedRet.flatMap { target => + hereCompleteGet(target).getOrElse(Seq(target)) + }).distinct + if (hereRet.size == 1 && hereRet.head == key) { None } else { Some(hereRet) } } } else { hereCompleteGet(key) |