From dc9c160dede7e2f5cc11755db6aaa57e7fccbcec Mon Sep 17 00:00:00 2001 From: Anna Zaks Date: Fri, 15 Mar 2013 01:15:12 +0000 Subject: [analyzer] Teach trackNullOrUndef to look through ternary operators Allows the suppression visitors trigger more often. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@177137 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/StaticAnalyzer/Core/BugReporterVisitors.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'lib/StaticAnalyzer/Core/BugReporterVisitors.cpp') diff --git a/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp b/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp index 22c148be93..550a74667f 100644 --- a/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp +++ b/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp @@ -772,16 +772,27 @@ static const MemRegion *getLocationRegionIfReference(const Expr *E, return 0; } -bool bugreporter::trackNullOrUndefValue(const ExplodedNode *ErrorNode, +bool bugreporter::trackNullOrUndefValue(const ExplodedNode *N, const Stmt *S, BugReport &report, bool IsArg) { - if (!S || !ErrorNode) + if (!S || !N) return false; + // Peel off OpaqueValueExpr. if (const OpaqueValueExpr *OVE = dyn_cast(S)) S = OVE->getSourceExpr(); - const ExplodedNode *N = ErrorNode; + // Peel off the ternary operator. + if (const ConditionalOperator *CO = dyn_cast(S)) { + ProgramStateRef State = N->getState(); + SVal CondVal = State->getSVal(CO->getCond(), N->getLocationContext()); + if (State->isNull(CondVal).isConstrainedTrue()) { + S = CO->getTrueExpr(); + } else { + assert(State->isNull(CondVal).isConstrainedFalse()); + S = CO->getFalseExpr(); + } + } const Expr *Inner = 0; if (const Expr *Ex = dyn_cast(S)) { -- cgit v1.2.3-70-g09d2