Author: Balazs Benics Date: 2022-06-14T18:56:43+02:00 New Revision: cfc915149c98ef1e791d20f1757df4b2c1e8655b
URL: https://github.com/llvm/llvm-project/commit/cfc915149c98ef1e791d20f1757df4b2c1e8655b DIFF: https://github.com/llvm/llvm-project/commit/cfc915149c98ef1e791d20f1757df4b2c1e8655b.diff LOG: [analyzer][NFC] Relocate unary transfer functions This is an initial step of removing the SimpleSValBuilder abstraction. The SValBuilder alone should be enough. Reviewed By: martong Differential Revision: https://reviews.llvm.org/D126127 Added: Modified: clang/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h clang/lib/StaticAnalyzer/Core/SValBuilder.cpp clang/lib/StaticAnalyzer/Core/SimpleSValBuilder.cpp Removed: ################################################################################ diff --git a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h index 2154a1dedeeeb..3d247e7887d70 100644 --- a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h +++ b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h @@ -120,9 +120,8 @@ class SValBuilder { SVal evalIntegralCast(ProgramStateRef state, SVal val, QualType castTy, QualType originalType); - virtual SVal evalMinus(NonLoc val) = 0; - - virtual SVal evalComplement(NonLoc val) = 0; + SVal evalMinus(NonLoc val); + SVal evalComplement(NonLoc val); /// Create a new value which represents a binary expression with two non- /// location operands. diff --git a/clang/lib/StaticAnalyzer/Core/SValBuilder.cpp b/clang/lib/StaticAnalyzer/Core/SValBuilder.cpp index ae590a3b73387..f5e4b176c5dda 100644 --- a/clang/lib/StaticAnalyzer/Core/SValBuilder.cpp +++ b/clang/lib/StaticAnalyzer/Core/SValBuilder.cpp @@ -441,6 +441,30 @@ SVal SValBuilder::makeSymExprValNN(BinaryOperator::Opcode Op, return UnknownVal(); } +SVal SValBuilder::evalMinus(NonLoc val) { + switch (val.getSubKind()) { + case nonloc::ConcreteIntKind: + return val.castAs<nonloc::ConcreteInt>().evalMinus(*this); + case nonloc::SymbolValKind: + return makeNonLoc(val.castAs<nonloc::SymbolVal>().getSymbol(), UO_Minus, + val.getType(Context)); + default: + return UnknownVal(); + } +} + +SVal SValBuilder::evalComplement(NonLoc X) { + switch (X.getSubKind()) { + case nonloc::ConcreteIntKind: + return X.castAs<nonloc::ConcreteInt>().evalComplement(*this); + case nonloc::SymbolValKind: + return makeNonLoc(X.castAs<nonloc::SymbolVal>().getSymbol(), UO_Not, + X.getType(Context)); + default: + return UnknownVal(); + } +} + SVal SValBuilder::evalUnaryOp(ProgramStateRef state, UnaryOperator::Opcode opc, SVal operand, QualType type) { auto OpN = operand.getAs<NonLoc>(); diff --git a/clang/lib/StaticAnalyzer/Core/SimpleSValBuilder.cpp b/clang/lib/StaticAnalyzer/Core/SimpleSValBuilder.cpp index 785039a186486..e03d4fe61e4c2 100644 --- a/clang/lib/StaticAnalyzer/Core/SimpleSValBuilder.cpp +++ b/clang/lib/StaticAnalyzer/Core/SimpleSValBuilder.cpp @@ -63,8 +63,6 @@ class SimpleSValBuilder : public SValBuilder { : SValBuilder(alloc, context, stateMgr) {} ~SimpleSValBuilder() override {} - SVal evalMinus(NonLoc val) override; - SVal evalComplement(NonLoc val) override; SVal evalBinOpNN(ProgramStateRef state, BinaryOperator::Opcode op, NonLoc lhs, NonLoc rhs, QualType resultTy) override; SVal evalBinOpLL(ProgramStateRef state, BinaryOperator::Opcode op, @@ -90,34 +88,6 @@ SValBuilder *ento::createSimpleSValBuilder(llvm::BumpPtrAllocator &alloc, return new SimpleSValBuilder(alloc, context, stateMgr); } -//===----------------------------------------------------------------------===// -// Transfer function for unary operators. -//===----------------------------------------------------------------------===// - -SVal SimpleSValBuilder::evalMinus(NonLoc val) { - switch (val.getSubKind()) { - case nonloc::ConcreteIntKind: - return val.castAs<nonloc::ConcreteInt>().evalMinus(*this); - case nonloc::SymbolValKind: - return makeNonLoc(val.castAs<nonloc::SymbolVal>().getSymbol(), UO_Minus, - val.getType(Context)); - default: - return UnknownVal(); - } -} - -SVal SimpleSValBuilder::evalComplement(NonLoc X) { - switch (X.getSubKind()) { - case nonloc::ConcreteIntKind: - return X.castAs<nonloc::ConcreteInt>().evalComplement(*this); - case nonloc::SymbolValKind: - return makeNonLoc(X.castAs<nonloc::SymbolVal>().getSymbol(), UO_Not, - X.getType(Context)); - default: - return UnknownVal(); - } -} - // Checks if the negation the value and flipping sign preserve // the semantics on the operation in the resultType static bool isNegationValuePreserving(const llvm::APSInt &Value, _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
