From a029b9bbb339b9b9fb90959a0b0fbe1467fe4b18 Mon Sep 17 00:00:00 2001
From: Adam Izraelevitz
Date: Mon, 14 Nov 2016 15:00:38 -0800
Subject: Fix wrong omitting same clocked nondirect children (#374)

* Fix wrong omitting same clocked nondirect children

* Minor style fixes
---
 src/main/scala/firrtl/passes/clocklist/ClockListUtils.scala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/main')

diff --git a/src/main/scala/firrtl/passes/clocklist/ClockListUtils.scala b/src/main/scala/firrtl/passes/clocklist/ClockListUtils.scala
index c79b6d1a..04e99d99 100644
--- a/src/main/scala/firrtl/passes/clocklist/ClockListUtils.scala
+++ b/src/main/scala/firrtl/passes/clocklist/ClockListUtils.scala
@@ -48,12 +48,14 @@ object ClockListUtils {
       case Module(i, n, ports, b) => ports.collectFirst { case p if p.name == "clock" => me + sep + "clock" }
       case ExtModule(i, n, ports, dn, p) => None
     }
-    // Return new origins with children removed, if they match my clock
+    // Return new origins with direct children removed, if they match my clock
     clockOpt match {
       case Some(clock) =>
         val myOrigin = getOrigin(connects, clock).serialize
         childrenOrigins.foldLeft(Map(me -> myOrigin)) { case (o, (childInstance, childOrigin)) =>
-          if(childOrigin == myOrigin) o else o + (childInstance -> childOrigin)
+          val childrenInstances = lin.children.map { case (instance, _) => me + sep + instance }
+          // If direct child shares my origin, omit it
+          if(childOrigin == myOrigin && childrenInstances.contains(childInstance)) o else o + (childInstance -> childOrigin)
         }
       case None => childrenOrigins
     }
-- 
cgit v1.2.3