From b81de69928b765949be0c79dea1d0cc714a31aa1 Mon Sep 17 00:00:00 2001
From: David Biancolin
Date: Wed, 29 Sep 2021 13:55:32 -0700
Subject: Have Flatten & InlineInstances remove their annotations (#2374)

* Have Flatten & InlineInstances remove their annotations

* Format---
 src/main/scala/firrtl/passes/Inline.scala      | 7 ++++++-
 src/main/scala/firrtl/transforms/Flatten.scala | 9 ++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/main/scala/firrtl/passes/Inline.scala b/src/main/scala/firrtl/passes/Inline.scala
index 78b3ce36..85eb7b51 100644
--- a/src/main/scala/firrtl/passes/Inline.scala
+++ b/src/main/scala/firrtl/passes/Inline.scala
@@ -369,6 +369,11 @@ class InlineInstances extends Transform with DependencyAPIMigration with Registe
 
     val renames = renamesSeq.reduceLeftOption(_ andThen _)
 
-    CircuitState(flatCircuit, LowForm, annos, renames)
+    val cleanedAnnos = annos.filterNot {
+      case InlineAnnotation(_) => true
+      case _                   => false
+    }
+
+    CircuitState(flatCircuit, LowForm, cleanedAnnos, renames)
   }
 }
diff --git a/src/main/scala/firrtl/transforms/Flatten.scala b/src/main/scala/firrtl/transforms/Flatten.scala
index 1d9f8083..0aa155bd 100644
--- a/src/main/scala/firrtl/transforms/Flatten.scala
+++ b/src/main/scala/firrtl/transforms/Flatten.scala
@@ -132,7 +132,14 @@ class Flatten extends Transform with DependencyAPIMigration {
         val (modNames, instNames) = collectAnns(state.circuit, myAnnotations)
         // take incoming annotation and produce annotations for InlineInstances, i.e. traverse circuit down to find all instances to inline
         val (newc, modsToInline) = duplicateSubCircuitsFromAnno(state.circuit, modNames, instNames)
-        inlineTransform.run(newc, modsToInline.toSet, Set.empty[ComponentName], state.annotations)
+        val flattenedState = inlineTransform.run(newc, modsToInline.toSet, Set.empty[ComponentName], state.annotations)
+
+        val cleanedAnnos = flattenedState.annotations.filterNot {
+          case FlattenAnnotation(_) => true
+          case _                    => false
+        }
+
+        flattenedState.copy(annotations = cleanedAnnos)
     }
   }
 }
-- 
cgit v1.2.3