mirror of
https://github.com/verilator/verilator.git
synced 2025-01-01 04:07:34 +00:00
Fix crash on duplicate imported modules (#3231).
This commit is contained in:
parent
3250ee5707
commit
28944ed862
1
Changes
1
Changes
@ -24,6 +24,7 @@ Verilator 5.011 devel
|
||||
* Fix initialization order of initial static after function/task (#4159). [Kamil Rakoczy, Antmicro Ltd]
|
||||
* Fix linking AstRefDType if it has parameterized class ref (#4164) (#4170). [Ryszard Rozak, Antmicro Ltd]
|
||||
* Fix crash caused by $display() optimization (#4165) (#4166). [Tudor Timi]
|
||||
* Fix crash on duplicate imported modules (#3231). [Robert Balas]
|
||||
* Fix detection of wire/reg duplicates.
|
||||
|
||||
|
||||
|
@ -116,6 +116,7 @@ private:
|
||||
VSymGraph m_mods; // Symbol table of all module names
|
||||
LinkCellsGraph m_graph; // Linked graph of all cell interconnects
|
||||
LibraryVertex* m_libVertexp = nullptr; // Vertex at root of all libraries
|
||||
int m_dedupNum = 0; // Package dedup number
|
||||
const V3GraphVertex* m_topVertexp = nullptr; // Vertex of top module
|
||||
std::unordered_set<string> m_declfnWarned; // Files we issued DECLFILENAME on
|
||||
string m_origTopModuleName; // original name of the top module
|
||||
@ -504,8 +505,13 @@ private:
|
||||
<< "... Location of original declaration\n"
|
||||
<< foundp->warnContextSecondary());
|
||||
}
|
||||
nodep->unlinkFrBack();
|
||||
VL_DO_DANGLING(pushDeletep(nodep), nodep);
|
||||
if (VN_IS(nodep, Package)) {
|
||||
// Packages may be imported, we instead rename to be unique
|
||||
nodep->name(nodep->name() + "__Vdedup" + cvtToStr(m_dedupNum++));
|
||||
} else {
|
||||
nodep->unlinkFrBack();
|
||||
VL_DO_DANGLING(pushDeletep(nodep), nodep);
|
||||
}
|
||||
} else if (!foundp) {
|
||||
m_mods.rootp()->insert(nodep->name(), new VSymEnt{&m_mods, nodep});
|
||||
}
|
||||
|
21
test_regress/t/t_package_dup_bad.out
Normal file
21
test_regress/t/t_package_dup_bad.out
Normal file
@ -0,0 +1,21 @@
|
||||
%Warning-MODDUP: t/t_package_dup_bad.v:11:9: Duplicate declaration of module: 'pkg'
|
||||
11 | package pkg;
|
||||
| ^~~
|
||||
t/t_package_dup_bad.v:7:9: ... Location of original declaration
|
||||
7 | package pkg;
|
||||
| ^~~
|
||||
... For warning description see https://verilator.org/warn/MODDUP?v=latest
|
||||
... Use "/* verilator lint_off MODDUP */" and lint_on around source to disable this message.
|
||||
%Warning-MODDUP: t/t_package_dup_bad.v:19:9: Duplicate declaration of module: 'pkg'
|
||||
19 | package pkg;
|
||||
| ^~~
|
||||
t/t_package_dup_bad.v:7:9: ... Location of original declaration
|
||||
7 | package pkg;
|
||||
| ^~~
|
||||
%Warning-MODDUP: t/t_package_dup_bad.v:22:9: Duplicate declaration of module: 'pkg'
|
||||
22 | package pkg;
|
||||
| ^~~
|
||||
t/t_package_dup_bad.v:7:9: ... Location of original declaration
|
||||
7 | package pkg;
|
||||
| ^~~
|
||||
%Error: Exiting due to
|
19
test_regress/t/t_package_dup_bad.pl
Executable file
19
test_regress/t/t_package_dup_bad.pl
Executable file
@ -0,0 +1,19 @@
|
||||
#!/usr/bin/env perl
|
||||
if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); die; }
|
||||
# DESCRIPTION: Verilator: Verilog Test driver/expect definition
|
||||
#
|
||||
# Copyright 2022 by Wilson Snyder. 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);
|
||||
|
||||
lint(
|
||||
fails => 1,
|
||||
expect_filename => $Self->{golden_filename},
|
||||
);
|
||||
|
||||
ok(1);
|
||||
1;
|
31
test_regress/t/t_package_dup_bad.v
Normal file
31
test_regress/t/t_package_dup_bad.v
Normal file
@ -0,0 +1,31 @@
|
||||
// DESCRIPTION: Verilator: Verilog Test module
|
||||
//
|
||||
// This file ONLY is placed into the Public Domain, for any use,
|
||||
// without warranty, 2023 by Wilson Snyder.
|
||||
// SPDX-License-Identifier: CC0-1.0
|
||||
|
||||
package pkg;
|
||||
localparam PARAM = 10;
|
||||
endpackage
|
||||
|
||||
package pkg;
|
||||
localparam PARAM = 10;
|
||||
endpackage
|
||||
|
||||
module sub import pkg::*;
|
||||
#( ) ();
|
||||
endmodule
|
||||
|
||||
package pkg;
|
||||
endpackage
|
||||
|
||||
package pkg;
|
||||
endpackage
|
||||
|
||||
module t (/*AUTOARG*/);
|
||||
sub sub ();
|
||||
initial begin
|
||||
$write("*-* All Finished *-*\n");
|
||||
$finish;
|
||||
end
|
||||
endmodule
|
Loading…
Reference in New Issue
Block a user