From 1bdfc31207f252f3c48bfda13be64559c944d2ce Mon Sep 17 00:00:00 2001
From: Sprite <SpriteOvO@gmail.com>
Date: Mon, 8 Jan 2024 10:24:14 +0100
Subject: [PATCH] [binder] Handle secret commands

---
 binder/src/main/scala/PanamaCIRCTConverter.scala | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/binder/src/main/scala/PanamaCIRCTConverter.scala b/binder/src/main/scala/PanamaCIRCTConverter.scala
index edeb5ed135e..8e4614599c3 100644
--- a/binder/src/main/scala/PanamaCIRCTConverter.scala
+++ b/binder/src/main/scala/PanamaCIRCTConverter.scala
@@ -1518,7 +1518,9 @@ private[chisel3] object PanamaCIRCTConverter {
   }
   def visitDefModule(defModule: DefModule)(implicit cvt: CIRCTConverter): Unit = {
     cvt.visitDefModule(defModule)
-    defModule.commands.zip(defModule.commands.map(Some(_)).drop(1) :+ None).foreach {
+    val commands = defModule.commands ++ defModule.secretCommands
+    // Workaround for https://github.com/chipsalliance/chisel/issues/3435, peeking the next command
+    commands.zip(commands.map(Some(_)).drop(1) :+ None).foreach {
       case (cmd, nextCmd) =>
         cmd match {
           // Command