From d750ffc129ca25027466641d69fd9483d5dbe864 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Fri, 29 Nov 2024 08:51:32 -0500 Subject: [PATCH] Internals: Fix debug dump of deleted nodes. --- nodist/code_coverage.dat | 1 + src/V3Ast.cpp | 7 +++++++ src/V3Ast.h | 6 ++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/nodist/code_coverage.dat b/nodist/code_coverage.dat index 0fd860a54..81a9af018 100644 --- a/nodist/code_coverage.dat +++ b/nodist/code_coverage.dat @@ -40,6 +40,7 @@ remove_gcda_regexp(r'test_regress/.*/(Vt_|Vtop_).*\.gcda') # Exclude line entirely, also excludes from function and branch coverage exclude_line_regexp(r'\bv3fatalSrc\b') exclude_line_regexp(r'\bfatalSrc\b') +exclude_line_regexp(r'\bVL_DELETED\b') exclude_line_regexp(r'\bVL_UNCOVERABLE\b') exclude_line_regexp(r'\bVL_UNREACHABLE\b') exclude_line_regexp(r'\bVL_FATAL') diff --git a/src/V3Ast.cpp b/src/V3Ast.cpp index 6ad2e4ef4..d0f41968f 100644 --- a/src/V3Ast.cpp +++ b/src/V3Ast.cpp @@ -1286,10 +1286,17 @@ void AstNode::dumpPtrs(std::ostream& os) const { void AstNode::dumpTree(std::ostream& os, const string& indent, int maxDepth) const { static int s_debugFileline = v3Global.opt.debugSrcLevel("fileline"); // --debugi-fileline 9 os << indent << " " << this << '\n'; + if (VN_DELETED(this)) return; if (debug() > 8) { os << indent << " "; dumpPtrs(os); } + if (VN_DELETED(op1p()) || VN_DELETED(op2p()) // LCOV_EXCL_START + || VN_DELETED(op3p()) || VN_DELETED(op4p())) { + os << indent << "1/2/3/4: %E-0x1/deleted! node " << cvtToHex(this) + << endl; // endl intentional to do flush + return; + } // LCOV_EXCL_STOP if (s_debugFileline >= 9) os << fileline()->warnContextSecondary(); if (maxDepth == 1) { if (op1p() || op2p() || op3p() || op4p()) os << indent << "1: ...(maxDepth)\n"; diff --git a/src/V3Ast.h b/src/V3Ast.h index 66466376b..4169c7dc2 100644 --- a/src/V3Ast.h +++ b/src/V3Ast.h @@ -2992,8 +2992,10 @@ bool AstNode::predicateImpl(ConstCorrectAstNode* nodep, const Callable& p } inline std::ostream& operator<<(std::ostream& os, const AstNode* rhs) { - if (!rhs) { - os << "nullptr"; + if (!rhs) { // LCOV_EXCL_LINE + os << "nullptr"; // LCOV_EXCL_LINE + } else if (VN_DELETED(rhs)) { // LCOV_EXCL_LINE + os << "%E-0x1/deleted!"; // LCOV_EXCL_LINE } else { rhs->dump(os); }