diff options
Diffstat (limited to 'lib/Checker')
| -rw-r--r-- | lib/Checker/CheckSecuritySyntaxOnly.cpp | 6 | ||||
| -rw-r--r-- | lib/Checker/DereferenceChecker.cpp | 1 | ||||
| -rw-r--r-- | lib/Checker/Environment.cpp | 3 | ||||
| -rw-r--r-- | lib/Checker/GRExprEngine.cpp | 17 | ||||
| -rw-r--r-- | lib/Checker/IdempotentOperationChecker.cpp | 2 |
5 files changed, 18 insertions, 11 deletions
diff --git a/lib/Checker/CheckSecuritySyntaxOnly.cpp b/lib/Checker/CheckSecuritySyntaxOnly.cpp index 9a2ac45fa2..0223240ce6 100644 --- a/lib/Checker/CheckSecuritySyntaxOnly.cpp +++ b/lib/Checker/CheckSecuritySyntaxOnly.cpp @@ -187,8 +187,10 @@ void WalkAST::CheckLoopConditionForFloat(const ForStmt *FS) { return; // Are we comparing variables? - const DeclRefExpr *drLHS = dyn_cast<DeclRefExpr>(B->getLHS()->IgnoreParens()); - const DeclRefExpr *drRHS = dyn_cast<DeclRefExpr>(B->getRHS()->IgnoreParens()); + const DeclRefExpr *drLHS = + dyn_cast<DeclRefExpr>(B->getLHS()->IgnoreParenLValueCasts()); + const DeclRefExpr *drRHS = + dyn_cast<DeclRefExpr>(B->getRHS()->IgnoreParenLValueCasts()); // Does at least one of the variables have a floating point type? drLHS = drLHS && drLHS->getType()->isRealFloatingType() ? drLHS : NULL; diff --git a/lib/Checker/DereferenceChecker.cpp b/lib/Checker/DereferenceChecker.cpp index 747fcbe311..af929a7af7 100644 --- a/lib/Checker/DereferenceChecker.cpp +++ b/lib/Checker/DereferenceChecker.cpp @@ -59,6 +59,7 @@ void DereferenceChecker::AddDerefSource(llvm::raw_ostream &os, llvm::SmallVectorImpl<SourceRange> &Ranges, const Expr *Ex, bool loadedFrom) { + Ex = Ex->IgnoreParenLValueCasts(); switch (Ex->getStmtClass()) { default: return; diff --git a/lib/Checker/Environment.cpp b/lib/Checker/Environment.cpp index aac4afaafb..4b67bda913 100644 --- a/lib/Checker/Environment.cpp +++ b/lib/Checker/Environment.cpp @@ -53,7 +53,8 @@ SVal Environment::getSVal(const Stmt *E, SValBuilder& svalBuilder) const { QualType CT = C->getType(); if (CT->isVoidType()) return UnknownVal(); - if (C->getCastKind() == CK_NoOp) { + if (C->getCastKind() == CK_NoOp || + C->getCastKind() == CK_LValueToRValue) { // temporary workaround E = C->getSubExpr(); continue; } diff --git a/lib/Checker/GRExprEngine.cpp b/lib/Checker/GRExprEngine.cpp index a43d36aaeb..e737eed8d1 100644 --- a/lib/Checker/GRExprEngine.cpp +++ b/lib/Checker/GRExprEngine.cpp @@ -778,6 +778,10 @@ void GRExprEngine::Visit(const Stmt* S, ExplodedNode* Pred, S->getLocStart(), "Error evaluating statement"); + // Expressions to ignore. + if (const Expr *Ex = dyn_cast<Expr>(S)) + S = Ex->IgnoreParenLValueCasts(); + // FIXME: add metadata to the CFG so that we can disable // this check when we KNOW that there is no block-level subexpression. // The motivation is that this check requires a hashtable lookup. @@ -814,7 +818,9 @@ void GRExprEngine::Visit(const Stmt* S, ExplodedNode* Pred, MakeNode(Dst, S, Pred, GetState(Pred)); break; } - + + case Stmt::ParenExprClass: + llvm_unreachable("ParenExprs already handled."); // Cases that should never be evaluated simply because they shouldn't // appear in the CFG. case Stmt::BreakStmtClass: @@ -1039,10 +1045,6 @@ void GRExprEngine::Visit(const Stmt* S, ExplodedNode* Pred, break; } - case Stmt::ParenExprClass: - Visit(cast<ParenExpr>(S)->getSubExpr()->IgnoreParens(), Pred, Dst); - break; - case Stmt::ReturnStmtClass: VisitReturnStmt(cast<ReturnStmt>(S), Pred, Dst); break; @@ -1113,8 +1115,8 @@ void GRExprEngine::VisitLValue(const Expr* Ex, ExplodedNode* Pred, Ex->getLocStart(), "Error evaluating statement"); - - Ex = Ex->IgnoreParens(); + // Expressions to ignore. + Ex = Ex->IgnoreParenLValueCasts(); if (Ex != CurrentStmt && Pred->getLocationContext()->getCFG()->isBlkExpr(Ex)){ Dst.Add(Pred); @@ -2661,6 +2663,7 @@ void GRExprEngine::VisitCast(const CastExpr *CastE, const Expr *Ex, } return; + case CK_GetObjCProperty: case CK_Dependent: case CK_ArrayToPointerDecay: case CK_BitCast: diff --git a/lib/Checker/IdempotentOperationChecker.cpp b/lib/Checker/IdempotentOperationChecker.cpp index 0e23c2a031..245caef485 100644 --- a/lib/Checker/IdempotentOperationChecker.cpp +++ b/lib/Checker/IdempotentOperationChecker.cpp @@ -543,7 +543,7 @@ bool IdempotentOperationChecker::isTruncationExtensionAssignment( if (VD != RHS_DR->getDecl()) return false; - return dyn_cast<DeclRefExpr>(RHS->IgnoreParens()) == NULL; + return dyn_cast<DeclRefExpr>(RHS->IgnoreParenLValueCasts()) == NULL; } // Returns false if a path to this block was not completely analyzed, or true |