From 7d0b48708b05aba6d840cc4a9d4ab00abe31929b Mon Sep 17 00:00:00 2001
From: Colin Schmidt
Date: Tue, 4 Apr 2017 14:33:38 -0700
Subject: DecorateMems should not delete annoations (#523)

---
 src/main/scala/firrtl/passes/memlib/DecorateMems.scala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main/scala/firrtl/passes/memlib/DecorateMems.scala b/src/main/scala/firrtl/passes/memlib/DecorateMems.scala
index e48dc8c2..648b0234 100644
--- a/src/main/scala/firrtl/passes/memlib/DecorateMems.scala
+++ b/src/main/scala/firrtl/passes/memlib/DecorateMems.scala
@@ -16,7 +16,8 @@ class CreateMemoryAnnotations(reader: Option[YamlFileReader]) extends Transform
       import CustomYAMLProtocol._
       val configs = r.parse[Config]
       val cN = CircuitName(state.circuit.main)
-      val (as, pins) = configs.foldLeft((Seq.empty[Annotation], Seq.empty[String])) { case ((annos, pins), config) =>
+      val oldAnnos = state.annotations.getOrElse(AnnotationMap(Seq.empty)).annotations
+      val (as, pins) = configs.foldLeft((oldAnnos, Seq.empty[String])) { case ((annos, pins), config) =>
         val top = TopAnnotation(ModuleName(config.top.name, cN), config.pin.name)
         val source = SourceAnnotation(ComponentName(config.source.name, ModuleName(config.source.module, cN)), config.pin.name)
         (annos ++ Seq(top, source), pins :+ config.pin.name)
-- 
cgit v1.2.3