Author: Valeriy Savchenko Date: 2021-06-11T12:49:04+03:00 New Revision: 3fc8d943c360f801a428ff24569d2dd53a2afe0f
URL: https://github.com/llvm/llvm-project/commit/3fc8d943c360f801a428ff24569d2dd53a2afe0f DIFF: https://github.com/llvm/llvm-project/commit/3fc8d943c360f801a428ff24569d2dd53a2afe0f.diff LOG: [analyzer] Refactor trackRValueExpression into ExpressionHandler Differential Revision: https://reviews.llvm.org/D103630 Added: Modified: clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp Removed: ################################################################################ diff --git a/clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp b/clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp index 651c80276110..677a1d39d8a0 100644 --- a/clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp +++ b/clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp @@ -2053,44 +2053,6 @@ static const ExplodedNode* findNodeForExpression(const ExplodedNode *N, return N; } -/// Attempts to add visitors to track an RValue expression back to its point of -/// origin. Works similarly to trackExpressionValue, but accepts only RValues. -static void trackRValueExpression(const ExplodedNode *InputNode, const Expr *E, - PathSensitiveBugReport &report, - bugreporter::TrackingKind TKind, - bool EnableNullFPSuppression) { - assert(E->isPRValue() && "The expression is not a prvalue!"); - const ExplodedNode *RVNode = findNodeForExpression(InputNode, E); - if (!RVNode) - return; - ProgramStateRef RVState = RVNode->getState(); - SVal V = RVState->getSValAsScalarOrLoc(E, RVNode->getLocationContext()); - const auto *BO = dyn_cast<BinaryOperator>(E); - if (!BO) - return; - if (!V.isZeroConstant()) - return; - if (!BO->isMultiplicativeOp()) - return; - - SVal RHSV = RVState->getSVal(BO->getRHS(), RVNode->getLocationContext()); - SVal LHSV = RVState->getSVal(BO->getLHS(), RVNode->getLocationContext()); - - // Track both LHS and RHS of a multiplication. - if (BO->getOpcode() == BO_Mul) { - if (LHSV.isZeroConstant()) - trackExpressionValue(InputNode, BO->getLHS(), report, TKind, - EnableNullFPSuppression); - if (RHSV.isZeroConstant()) - trackExpressionValue(InputNode, BO->getRHS(), report, TKind, - EnableNullFPSuppression); - } else { // Track only the LHS of a division or a modulo. - if (LHSV.isZeroConstant()) - trackExpressionValue(InputNode, BO->getLHS(), report, TKind, - EnableNullFPSuppression); - } -} - //===----------------------------------------------------------------------===// // Tracker implementation //===----------------------------------------------------------------------===// @@ -2245,17 +2207,61 @@ class DefaultExpressionHandler final : public ExpressionHandler { } } - if (Inner->isPRValue()) - // TODO: Incorporate as Handler - trackRValueExpression(LVNode, Inner, Report, Opts.Kind, - Opts.EnableNullFPSuppression); - return Result; } }; +/// Attempts to add visitors to track an RValue expression back to its point of +/// origin. +class PRValueHandler final : public ExpressionHandler { +public: + using ExpressionHandler::ExpressionHandler; + + Tracker::Result handle(const Expr *E, const ExplodedNode *InputNode, + const ExplodedNode *ExprNode, + TrackingOptions Opts) override { + if (!E->isPRValue()) + return {}; + + const ExplodedNode *RVNode = findNodeForExpression(ExprNode, E); + if (!RVNode) + return {}; + + ProgramStateRef RVState = RVNode->getState(); + SVal V = RVState->getSValAsScalarOrLoc(E, RVNode->getLocationContext()); + const auto *BO = dyn_cast<BinaryOperator>(E); + + if (!BO || !BO->isMultiplicativeOp() || !V.isZeroConstant()) + return {}; + + SVal RHSV = RVState->getSVal(BO->getRHS(), RVNode->getLocationContext()); + SVal LHSV = RVState->getSVal(BO->getLHS(), RVNode->getLocationContext()); + + // Track both LHS and RHS of a multiplication. + Tracker::Result CombinedResult; + Tracker &Parent = getParentTracker(); + + const auto track = [&CombinedResult, &Parent, ExprNode, Opts](Expr *Inner) { + CombinedResult.combineWith(Parent.track(Inner, ExprNode, Opts)); + }; + + if (BO->getOpcode() == BO_Mul) { + if (LHSV.isZeroConstant()) + track(BO->getLHS()); + if (RHSV.isZeroConstant()) + track(BO->getRHS()); + } else { // Track only the LHS of a division or a modulo. + if (LHSV.isZeroConstant()) + track(BO->getLHS()); + } + + return CombinedResult; + } +}; + Tracker::Tracker(PathSensitiveBugReport &Report) : Report(Report) { addHighPriorityHandler<DefaultExpressionHandler>(); + addLowPriorityHandler<PRValueHandler>(); // TODO: split trackExpressionValue and FindLastStoreBRVisitor into handlers // and add them here. } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
