From 0531cb53d3cedaff33c2a280e34418f6af5bc6a1 Mon Sep 17 00:00:00 2001
From: Jack Koenig
Date: Tue, 29 Jun 2021 15:34:18 -0700
Subject: Restore aop.Select behavior for CloneModuleAsRecord

---
 src/main/scala/chisel3/aop/Select.scala | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/main/scala/chisel3')

diff --git a/src/main/scala/chisel3/aop/Select.scala b/src/main/scala/chisel3/aop/Select.scala
index b9ad808b..08cf40ff 100644
--- a/src/main/scala/chisel3/aop/Select.scala
+++ b/src/main/scala/chisel3/aop/Select.scala
@@ -6,6 +6,7 @@ import chisel3._
 import chisel3.experimental.{BaseModule, FixedPoint}
 import chisel3.internal.HasId
 import chisel3.internal.firrtl._
+import chisel3.internal.BaseModule.ModuleClone
 import firrtl.annotations.ReferenceTarget
 
 import scala.collection.mutable
@@ -82,7 +83,10 @@ object Select {
     check(module)
     module._component.get match {
       case d: DefModule => d.commands.collect {
-        case i: DefInstance => i.id
+        case i: DefInstance => i.id match {
+          case clone: ModuleClone => clone._proto
+          case other              => other
+        }
       }
       case other => Nil
     }
-- 
cgit v1.2.3


From 25a84b5667614ea3f437b656f1939caba57e6f66 Mon Sep 17 00:00:00 2001
From: Jack Koenig
Date: Tue, 29 Jun 2021 16:39:45 -0700
Subject: Change behavior of aop.Select to not include CloneModuleAsRecord

Previously, CloneModuleAsRecord clones would result in the same
BaseModule object coming up multiple times when using APIs like
.instances, .collectDeep, and .getDeep. This was not the intended
behavior and can lead to very subtle bugs.
---
 src/main/scala/chisel3/aop/Select.scala | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/main/scala/chisel3')

diff --git a/src/main/scala/chisel3/aop/Select.scala b/src/main/scala/chisel3/aop/Select.scala
index 08cf40ff..a16c415c 100644
--- a/src/main/scala/chisel3/aop/Select.scala
+++ b/src/main/scala/chisel3/aop/Select.scala
@@ -82,11 +82,12 @@ object Select {
   def instances(module: BaseModule): Seq[BaseModule] = {
     check(module)
     module._component.get match {
-      case d: DefModule => d.commands.collect {
+      case d: DefModule => d.commands.flatMap {
         case i: DefInstance => i.id match {
-          case clone: ModuleClone => clone._proto
-          case other              => other
+          case _: ModuleClone => None
+          case other          => Some(other)
         }
+        case _ => None
       }
       case other => Nil
     }
-- 
cgit v1.2.3