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

Internals: Cleanup assertion

This commit is contained in:
Wilson Snyder 2025-09-17 23:38:00 -04:00
parent 3a039df351
commit 7f871467bf
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/V3Width.cpp
View File

@ -7727,7 +7727,8 @@ class WidthVisitor final : public VNVisitor {
// underp may change as a result of replacement // underp may change as a result of replacement
UASSERT_OBJ(underp, parentp, "Node has no child"); UASSERT_OBJ(underp, parentp, "Node has no child");
underp = userIterateSubtreeReturnEdits(underp, WidthVP{SELF, BOTH}.p()); underp = userIterateSubtreeReturnEdits(underp, WidthVP{SELF, BOTH}.p());
UASSERT_OBJ(underp && underp->dtypep(), parentp, UASSERT_OBJ(underp, parentp, "Node has no child");
UASSERT_OBJ(underp->dtypep(), underp,
"Node has no type"); // Perhaps forgot to do a prelim visit on it? "Node has no type"); // Perhaps forgot to do a prelim visit on it?
// //
// For DOUBLE under a logical op, add implied test against zero, never a warning // For DOUBLE under a logical op, add implied test against zero, never a warning
@ -7779,7 +7780,8 @@ class WidthVisitor final : public VNVisitor {
// Returns the new underp // Returns the new underp
// Conversion to/from doubles and integers are before iterating. // Conversion to/from doubles and integers are before iterating.
UASSERT_OBJ(stage == FINAL, parentp, "Bad state to iterateCheck"); UASSERT_OBJ(stage == FINAL, parentp, "Bad state to iterateCheck");
UASSERT_OBJ(underp && underp->dtypep(), parentp, UASSERT_OBJ(underp, parentp, "Node has no child");
UASSERT_OBJ(underp->dtypep(), underp,
"Node has no type"); // Perhaps forgot to do a prelim visit on it? "Node has no type"); // Perhaps forgot to do a prelim visit on it?
if (VN_IS(underp, NodeDType)) { // Note the node itself, not node's data type if (VN_IS(underp, NodeDType)) { // Note the node itself, not node's data type
// Must be near top of these checks as underp->dtypep() will look normal // Must be near top of these checks as underp->dtypep() will look normal

4
test_regress/t/t_class_param_nested_bad.out
View File

@ -4,8 +4,8 @@
51 | Wrap2 #(Wrap#(19)::PBASE * 2) w38; 51 | Wrap2 #(Wrap#(19)::PBASE * 2) w38;
| ^~~~~ | ^~~~~
... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest ... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest
%Error: Internal Error: t/t_class_param_nested_bad.v:51:29: ../V3Width.cpp:#: Node has no type %Error: Internal Error: t/t_class_param_nested_bad.v:51:23: ../V3Width.cpp:#: Node has no type
: ... note: In instance 't' : ... note: In instance 't'
51 | Wrap2 #(Wrap#(19)::PBASE * 2) w38; 51 | Wrap2 #(Wrap#(19)::PBASE * 2) w38;
| ^ | ^~~~~
... This fatal error may be caused by the earlier error(s); resolve those first. ... This fatal error may be caused by the earlier error(s); resolve those first.

4
test_regress/t/t_dynarray_bits.out
View File

@ -3,8 +3,8 @@
12 | if ($bits(a) != 0) $stop; 12 | if ($bits(a) != 0) $stop;
| ^~~~~ | ^~~~~
... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest ... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest
%Error: Internal Error: t/t_dynarray_bits.v:12:20: ../V3Width.cpp:#: Node has no type %Error: Internal Error: t/t_dynarray_bits.v:12:11: ../V3Width.cpp:#: Node has no type
: ... note: In instance 't' : ... note: In instance 't'
12 | if ($bits(a) != 0) $stop; 12 | if ($bits(a) != 0) $stop;
| ^~ | ^~~~~
... This fatal error may be caused by the earlier error(s); resolve those first. ... This fatal error may be caused by the earlier error(s); resolve those first.

2
test_regress/t/t_stream_unpack_lhs.out
View File

@ -15,7 +15,7 @@
: ... note: In instance 't' : ... note: In instance 't'
117 | if (packed_siz_dout != '{8'h01, 8'h23, 8'h45, 8'h67}) $stop; 117 | if (packed_siz_dout != '{8'h01, 8'h23, 8'h45, 8'h67}) $stop;
| ^~ | ^~
%Error: Internal Error: t/t_stream_unpack_lhs.v:117:33: ../V3Width.cpp:#: Node has no type %Error: Internal Error: t/t_stream_unpack_lhs.v:117:36: ../V3Width.cpp:#: Node has no type
: ... note: In instance 't' : ... note: In instance 't'
117 | if (packed_siz_dout != '{8'h01, 8'h23, 8'h45, 8'h67}) $stop; 117 | if (packed_siz_dout != '{8'h01, 8'h23, 8'h45, 8'h67}) $stop;
| ^~ | ^~