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

Merge branch 'master' into develop-v5

This commit is contained in:
Geza Lore 2022-09-21 12:19:00 +01:00
parent 550a5111b7 0a8cfb8d2c
commit 72e7271a14
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/V3Ast.cpp
View File

@ -1212,7 +1212,11 @@ void AstNode::v3errorEnd(std::ostringstream& str) const {
const_cast<AstNode*>(this)->dump(nsstr); const_cast<AstNode*>(this)->dump(nsstr);
nsstr << endl; nsstr << endl;
} }
m_fileline->v3errorEnd(nsstr, instanceStr()); // Don't look for instance name when warning is disabled.
// In case of large number of warnings, this can
// take significant amount of time
m_fileline->v3errorEnd(nsstr,
m_fileline->warnIsOff(V3Error::errorCode()) ? "" : instanceStr());
} }
} }

2
test_regress/t/t_trace_open_wrong_order.cpp
View File

@ -17,7 +17,7 @@ int main(int argc, char** argv) {
VerilatedVcdC tfp; VerilatedVcdC tfp;
Vt_trace_open_wrong_order dut; Vt_trace_open_wrong_order dut;
ctx.traceEverOn(true); ctx.traceEverOn(true);
tfp.open("dump.vcd"); // Error! shall put to the next line! tfp.open(VL_STRINGIFY(TEST_OBJ_DIR) "/dump.vcd"); // Error! shall put to the next line!
dut.trace(&tfp, 99); // Error! dut.trace(&tfp, 99); // Error!
tfp.dump(0); tfp.dump(0);
tfp.close(); tfp.close();