luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix package imports not found after parameters applied (#6373).

This commit is contained in:
Wilson Snyder 2025-09-03 19:45:43 -04:00
parent 7a4049b683
commit 929d2ad83a
4 changed files with 58 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changes
View File

@ -16,6 +16,7 @@ Verilator 5.041 devel
* Fix while loop hang on timing-delayed assignment (#6343) (#6354). [Krzysztof Bieganski, Antmicro Ltd.]
* Fix V3Hash MacOS ambiguity (#6350). [Lan Zongwei]
* Fix cmake APPLE variable (#6351). [Lan Zongwei]
* Fix package imports not found after parameters applied (#6373). [Alex Solomatnikov]
Verilator 5.040 2025-08-30

16
src/V3LinkDot.cpp
View File

@ -168,8 +168,8 @@ private:
public:
// METHODS
void dumpSelf(const string& nameComment = "linkdot", bool force = false) {
if (dumpLevel() >= 6 || force) {
void dumpSelf(const string& nameComment, bool force = false) {
if (debug() >= 6 || dumpLevel() >= 6 || force) {
const string filename = v3Global.debugFilename(nameComment) + ".txt";
const std::unique_ptr<std::ofstream> logp{V3File::new_ofstream(filename)};
if (logp->fail()) v3fatal("Can't write file: " << filename);
@ -4880,19 +4880,19 @@ class LinkDotResolveVisitor final : public VNVisitor {
// No longer needed
LINKDOT_VISIT_START();
checkNoDot(nodep);
VL_DO_DANGLING(pushDeletep(nodep->unlinkFrBack()), nodep);
if (m_statep->forParamed()) VL_DO_DANGLING(pushDeletep(nodep->unlinkFrBack()), nodep);
}
void visit(AstPackageExport* nodep) override {
// No longer needed
LINKDOT_VISIT_START();
checkNoDot(nodep);
VL_DO_DANGLING(pushDeletep(nodep->unlinkFrBack()), nodep);
if (m_statep->forParamed()) VL_DO_DANGLING(pushDeletep(nodep->unlinkFrBack()), nodep);
}
void visit(AstPackageExportStarStar* nodep) override {
// No longer needed
LINKDOT_VISIT_START();
checkNoDot(nodep);
VL_DO_DANGLING(pushDeletep(nodep->unlinkFrBack()), nodep);
if (m_statep->forParamed()) VL_DO_DANGLING(pushDeletep(nodep->unlinkFrBack()), nodep);
}
void visit(AstCellRef* nodep) override {
LINKDOT_VISIT_START();
@ -5009,13 +5009,13 @@ void V3LinkDot::linkDotGuts(AstNetlist* rootp, VLinkDotStep step) {
} else {
v3fatalSrc("Bad case");
}
state.dumpSelf();
state.dumpSelf("prelinkdot");
state.computeIfaceModSyms();
state.computeIfaceVarSyms();
state.computeScopeAliases();
state.dumpSelf();
state.dumpSelf("linkdot-preresolve");
LinkDotResolveVisitor visitor{rootp, &state};
state.dumpSelf();
state.dumpSelf("linkdot-done");
}
void V3LinkDot::linkDotPrimary(AstNetlist* nodep) {

16
test_regress/t/t_package_import_param.py Executable file
View File

@ -0,0 +1,16 @@
#!/usr/bin/env python3
# DESCRIPTION: Verilator: Verilog Test driver/expect definition
#
# Copyright 2025 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
import vltest_bootstrap
test.scenarios('linter')
test.lint()
test.passes()

33
test_regress/t/t_package_import_param.v Normal file
View File

@ -0,0 +1,33 @@
// DESCRIPTION: Verilator: Verilog Test module
//
// This file ONLY is placed under the Creative Commons Public Domain, for
// any use, without warranty, 2025 by Wilson Snyder.
// SPDX-License-Identifier: CC0-1.0
package s_pkg;
typedef enum bit [4:0] {MEM_REQ = 5'b00000} P_Type_e;
endpackage
package pkg;
import s_pkg::*;
virtual class uvm_sequence #(
type REQ = int
);
REQ m_req;
endclass
class cls_txn;
P_Type_e m_type;
endclass
class cls_seq extends uvm_sequence #(cls_txn);
endclass
class p_mem_seq extends cls_seq;
virtual task body();
if (0 == (m_req.randomize() with {m_req.m_type == MEM_REQ;})) begin
end
endtask
endclass
endpackage