From 5d980351700b42e3a9ef49f29887e806ad66bded Mon Sep 17 00:00:00 2001
From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Date: Thu, 13 Aug 2020 14:23:02 +0200
Subject: [PATCH] Fix sc names (#2500)

cint.mainInt(nodep) walks the tree and populates m_ctorVarsVec.
Reuse EmitCImp cint for the slow mainImp() emition steps to make sure
we emit constructor calls to setup SystemC sc_module names.
---
 docs/CONTRIBUTORS             |  1 +
 src/V3EmitC.cpp               |  4 ++--
 test_regress/t/t_sc_names.cpp | 30 ++++++++++++++++++++++++++++++
 test_regress/t/t_sc_names.pl  | 30 ++++++++++++++++++++++++++++++
 test_regress/t/t_sc_names.v   | 11 +++++++++++
 5 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 test_regress/t/t_sc_names.cpp
 create mode 100755 test_regress/t/t_sc_names.pl
 create mode 100644 test_regress/t/t_sc_names.v

diff --git a/docs/CONTRIBUTORS b/docs/CONTRIBUTORS
index ca27e539a..5eeec896c 100644
--- a/docs/CONTRIBUTORS
+++ b/docs/CONTRIBUTORS
@@ -11,6 +11,7 @@ Dan Petrisko
 David Horton
 David Stanford
 Driss Hafdi
+Edgar E. Iglesias
 Eric Rippey
 Fan Shupei
 Garrett Smith
diff --git a/src/V3EmitC.cpp b/src/V3EmitC.cpp
index 690b65177..441ca96be 100644
--- a/src/V3EmitC.cpp
+++ b/src/V3EmitC.cpp
@@ -3791,8 +3791,8 @@ void V3EmitC::emitc() {
          nodep = VN_CAST(nodep->nextp(), NodeModule)) {
         if (VN_IS(nodep, Class)) continue;  // Imped with ClassPackage
         // clang-format off
-        { EmitCImp cint; cint.mainInt(nodep); }
-        { EmitCImp slow; slow.mainImp(nodep, true); }
+        EmitCImp cint; cint.mainInt(nodep);
+        cint.mainImp(nodep, true);
         { EmitCImp fast; fast.mainImp(nodep, false); }
         // clang-format on
     }
diff --git a/test_regress/t/t_sc_names.cpp b/test_regress/t/t_sc_names.cpp
new file mode 100644
index 000000000..13316602e
--- /dev/null
+++ b/test_regress/t/t_sc_names.cpp
@@ -0,0 +1,30 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
+// This file ONLY is placed under the Creative Commons Public Domain, for
+// any use, without warranty, 2020 by Edgar E. Iglesias.
+// SPDX-License-Identifier: CC0-1.0
+
+#include VM_PREFIX_INCLUDE
+#include "Vt_sc_names.h"
+
+VM_PREFIX* tb = NULL;
+
+int sc_main(int argc, char* argv[]) {
+    tb = new VM_PREFIX("tb");
+    std::vector < sc_object* > ch = tb->get_child_objects();
+    bool found = false;
+
+    /* We expect to find clk in here. */
+    for (int i = 0; i < ch.size(); ++i) {
+        if (!strcmp(ch[i]->basename(), "clk")) {
+            found = true;
+        }
+    }
+
+    if (found) {
+        VL_PRINTF("*-* All Finished *-*\n");
+        tb->final();
+    } else {
+        vl_fatal(__FILE__, __LINE__, "tb", "Unexpected results\n");
+    }
+    return 0;
+}
diff --git a/test_regress/t/t_sc_names.pl b/test_regress/t/t_sc_names.pl
new file mode 100755
index 000000000..2dc3e81c8
--- /dev/null
+++ b/test_regress/t/t_sc_names.pl
@@ -0,0 +1,30 @@
+#!/usr/bin/env perl
+if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); die; }
+# DESCRIPTION: Verilator: Verilog Test driver/expect definition
+#
+# Copyright 2020 by Edgar E. Iglesias. This program is free software; you
+# can redistribute it and/or modify it under the terms of either the GNU
+# Lesser General Public License Version 3 or the Perl Artistic License
+# Version 2.0.
+# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
+
+scenarios(simulator => 1);
+
+if (!$Self->have_sc) {
+    skip("No SystemC installed");
+}
+else {
+    top_filename("t/t_sc_names.v");
+
+    compile(
+        make_main => 0,
+        verilator_flags2 => ["-sc --exe $Self->{t_dir}/t_sc_names.cpp"],
+        );
+
+    execute(
+        check_finished => 1,
+        );
+}
+
+ok(1);
+1;
diff --git a/test_regress/t/t_sc_names.v b/test_regress/t/t_sc_names.v
new file mode 100644
index 000000000..13bcd4371
--- /dev/null
+++ b/test_regress/t/t_sc_names.v
@@ -0,0 +1,11 @@
+// DESCRIPTION: Verilator: Verilog Test module
+//
+// This file ONLY is placed under the Creative Commons Public Domain, for
+// any use, without warranty, 2020 by Edgar E. Iglesias.
+// SPDX-License-Identifier: CC0-1.0
+
+module t (
+   clk
+   );
+   input clk;
+endmodule