github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-04-05 12:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix object reference to conditional null : null

Browse Source
This commit is contained in:
Wilson Snyder 2024-03-16 08:56:12 -04:00
parent 5f8c06c805
commit d3b93a1113
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/V3Width.cpp
View File

@ -490,7 +490,9 @@ class WidthVisitor final : public VNVisitor {
// the expression includes the size of the output too. // the expression includes the size of the output too.
const AstNodeDType* const thenDTypep = nodep->thenp()->dtypep(); const AstNodeDType* const thenDTypep = nodep->thenp()->dtypep();
const AstNodeDType* const elseDTypep = nodep->elsep()->dtypep(); const AstNodeDType* const elseDTypep = nodep->elsep()->dtypep();
if (thenDTypep->skipRefp() == elseDTypep->skipRefp()) { if (nodep->thenp()->isNull() && nodep->elsep()->isNull()) {
nodep->dtypep(m_vup->dtypeNullp());
} else if (thenDTypep->skipRefp() == elseDTypep->skipRefp()) {
// TODO might need a broader equation, use the Castable function? // TODO might need a broader equation, use the Castable function?
nodep->dtypeFrom(thenDTypep); nodep->dtypeFrom(thenDTypep);
} else if (nodep->thenp()->isClassHandleValue() } else if (nodep->thenp()->isClassHandleValue()

20
test_regress/t/t_class_assign_cond.v
View File

@ -35,6 +35,7 @@ module t (/*AUTOARG*/);
ExtendCls ext_cls = null; ExtendCls ext_cls = null;
AnotherExtendCls an_ext_cls = null; AnotherExtendCls an_ext_cls = null;
ExtendExtendCls ext_ext_cls = null; ExtendExtendCls ext_ext_cls = null;
int r;
cls1 = (cls1 == null) ? cls2 : cls1; cls1 = (cls1 == null) ? cls2 : cls1;
if (cls1 != null) $stop; if (cls1 != null) $stop;
@ -64,6 +65,25 @@ module t (/*AUTOARG*/);
cls1 = (ext_ext_cls.f != 4) ? ext_ext_cls : an_ext_cls; cls1 = (ext_ext_cls.f != 4) ? ext_ext_cls : an_ext_cls;
if (cls1.f != 5) $stop; if (cls1.f != 5) $stop;
ext_cls = new(3);
r = $random;
cls1 = r[0] ? ext_cls : null;
if (cls1 != null && cls1.f != 3) $stop;
ext_cls = new(3);
r = $random;
cls1 = r[0] ? null : ext_cls;
if (cls1 != null && cls1.f != 3) $stop;
ext_cls = new(3);
r = $random;
cls1 = r[0] ? null : null;
if (cls1 != null) $stop;
ext_cls = new(3);
cls1 = (ext_cls == null) ? null : null;
if (cls1 != null) $stop;
$write("*-* All Finished *-*\n"); $write("*-* All Finished *-*\n");
$finish; $finish;
end end