From 5c3e3a35c2d3e80843d405feadbede73dfc31b18 Mon Sep 17 00:00:00 2001
From: Mateusz Gancarz <mgancarz@antmicro.com>
Date: Thu, 20 Feb 2025 15:48:09 +0100
Subject: [PATCH] [#73220] change signal name to its final name

---
 include/verilated_saif_c.cpp | 13 ++++---------
 include/verilated_saif_c.h   |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/include/verilated_saif_c.cpp b/include/verilated_saif_c.cpp
index 705439a97..e6ea48aea 100644
--- a/include/verilated_saif_c.cpp
+++ b/include/verilated_saif_c.cpp
@@ -280,7 +280,7 @@ void VerilatedSaif::recursivelyPrintScopes(uint32_t scopeIndex) {
 
             printIndent();
             printStr("(");
-            printStr(signalName);
+            printStr(signalName.c_str());
             if (activity.width > 1) {
                 printStr("[");
                 printStr(std::to_string(activity.lsb + i).c_str());
@@ -451,14 +451,6 @@ void VerilatedSaif::popPrefix() {
 
 void VerilatedSaif::declare(uint32_t code, const char* name, const char* wirep, bool array,
                             int arraynum, bool bussed, int msb, int lsb) {
-    assert(m_currentScope >= 0);
-    m_scopes.at(m_currentScope).childSignals.emplace_back(code, name);
-
-    // check if already declared to avoid duplicates
-    if (m_activity.count(code)) {
-        return;
-    }
-    
     const int bits = ((msb > lsb) ? (msb - lsb) : (lsb - msb)) + 1;
 
     std::string hierarchicalName = m_prefixStack.back().first + name;
@@ -481,6 +473,9 @@ void VerilatedSaif::declare(uint32_t code, const char* name, const char* wirep,
         finalName += ']';
     }
 
+    assert(m_currentScope >= 0);
+    m_scopes.at(m_currentScope).childSignals.emplace_back(code, std::move(finalName));
+
     m_activity.emplace(code, ActivityVar{
         static_cast<uint32_t>(lsb),
         static_cast<uint32_t>(bits),
diff --git a/include/verilated_saif_c.h b/include/verilated_saif_c.h
index b44c65d57..04adb8f09 100644
--- a/include/verilated_saif_c.h
+++ b/include/verilated_saif_c.h
@@ -54,7 +54,7 @@ struct ActivityVar {
 struct SaifScope {
     std::string scopeName{};
     std::vector<int32_t> childScopesIndices{};
-    std::vector<std::pair<uint32_t, const char*>> childSignals{};
+    std::vector<std::pair<uint32_t, std::string>> childSignals{};
     int32_t parentScopeIndex{-1};
 };