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

Fix internal error if always block without begin-end has concat (#2640) (#2641)

This commit is contained in:
Yutetsu TAKATSUKASA 2020-11-13 23:50:09 +09:00 committed by GitHub
parent 7eac788306
commit e8c03650ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/V3SplitVar.cpp
View File

@ -460,13 +460,17 @@ class SplitUnpackedVarVisitor : public AstNVisitor, public SplitVarImpl {
if (nodep->sensesp()) { // When visiting sensitivity list, always is the context if (nodep->sensesp()) { // When visiting sensitivity list, always is the context
setContextAndIterate(nodep, nodep->sensesp()); setContextAndIterate(nodep, nodep->sensesp());
} }
if (AstNode* bodysp = nodep->bodysp()) iterate(bodysp); for (AstNode* bodysp = nodep->bodysp(); bodysp; bodysp = bodysp->nextp()) {
iterate(bodysp);
}
}; };
virtual void visit(AstAlwaysPublic* nodep) override { virtual void visit(AstAlwaysPublic* nodep) override {
if (nodep->sensesp()) { // When visiting sensitivity list, always is the context if (nodep->sensesp()) { // When visiting sensitivity list, always is the context
setContextAndIterate(nodep, nodep->sensesp()); setContextAndIterate(nodep, nodep->sensesp());
} }
if (AstNode* bodysp = nodep->bodysp()) iterate(bodysp); for (AstNode* bodysp = nodep->bodysp(); bodysp; bodysp = bodysp->nextp()) {
iterate(bodysp);
}
} }
virtual void visit(AstNodeFTaskRef* nodep) override { virtual void visit(AstNodeFTaskRef* nodep) override {
VL_RESTORER(m_contextp); VL_RESTORER(m_contextp);

3
test_regress/t/t_split_var_0.v
View File

@ -166,7 +166,8 @@ module barshift_1d_unpacked_struct1 #(parameter DEPTH = 2, localparam WIDTH = 2*
end end
endgenerate endgenerate
assign tmp[0+OFFSET] = {pad, in}; assign tmp[0+OFFSET] = {pad, in};
assign out = tmp[DEPTH+OFFSET][WIDTH-1:0]; logic _dummy;
always_comb {_dummy, out[WIDTH-1:1], out[0]} = tmp[DEPTH+OFFSET][WIDTH:0];
endmodule endmodule