From c0f8629f7c0ae6b52b9a0d6f159351cd9156b049 Mon Sep 17 00:00:00 2001
From: nella <simontupy64@gmail.com>
Date: Sat, 19 Sep 2026 12:38:04 +0200
Subject: [PATCH] Keep scopeinfo.

---
 backends/aiger2/aiger.cc     | 4 +++-
 tests/abc_new/generate_mk.py | 1 -
 tests/abc_new/scopeinfo.ys   | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/backends/aiger2/aiger.cc b/backends/aiger2/aiger.cc
index 246ddfe19..4bd721c27 100644
--- a/backends/aiger2/aiger.cc
+++ b/backends/aiger2/aiger.cc
@@ -1708,7 +1708,9 @@ struct XAigerWriter : AigerWriter {
 		if (mapping_prep) {
 			std::vector<Cell *> to_remove_cells;
 			for (auto cell : top->cells())
-				if (!top_minfo->found_blackboxes.count(cell) && !keep_cells.count(cell))
+				// $scopeinfo isn't part of the mapping
+				if (cell->type != ID($scopeinfo) &&
+						!top_minfo->found_blackboxes.count(cell) && !keep_cells.count(cell))
 					to_remove_cells.push_back(cell);
 			for (auto cell : to_remove_cells)
 				top->remove(cell);
diff --git a/tests/abc_new/generate_mk.py b/tests/abc_new/generate_mk.py
index 94dd12723..9026a6fee 100644
--- a/tests/abc_new/generate_mk.py
+++ b/tests/abc_new/generate_mk.py
@@ -10,7 +10,6 @@ import gen_tests_makefile
 skip = [
     "hier_check.ys",
     "keep_wire.ys",
-    "scopeinfo.ys",
 ]
 
 def create_tests():
diff --git a/tests/abc_new/scopeinfo.ys b/tests/abc_new/scopeinfo.ys
index 6b99a0dd7..f6c2923f6 100644
--- a/tests/abc_new/scopeinfo.ys
+++ b/tests/abc_new/scopeinfo.ys
@@ -12,7 +12,10 @@ EOT
 hierarchy -top top
 proc
 opt
+design -save gold_hier
+flatten
 design -save gold
+design -load gold_hier
 flatten -scopename
 select -assert-count 2 t:$scopeinfo
 techmap