maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Teach GRExprEngine to handle the initialization of the condition variable of a SwitchStmt. 

llvm-svn: 92102
This commit is contained in:
Ted Kremenek 2009-12-24 00:40:03 +00:00
parent 8b5dc12e52
commit 589493227b
3 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/include/clang/Analysis/PathSensitive/GRExprEngine.h
View File

@ -293,10 +293,10 @@ protected:
void VisitGuardedExpr(Expr* Ex, Expr* L, Expr* R, ExplodedNode* Pred, void VisitGuardedExpr(Expr* Ex, Expr* L, Expr* R, ExplodedNode* Pred,
ExplodedNodeSet& Dst); ExplodedNodeSet& Dst);
/// VisitIfStmtCondInit - Transfer function for handling the initialization /// VisitCondInit - Transfer function for handling the initialization
/// of a condition variable in an IfStmt. /// of a condition variable in an IfStmt, SwitchStmt, etc.
void VisitIfStmtCondInit(IfStmt *IS, ExplodedNode *Pred, void VisitCondInit(VarDecl *VD, Stmt *S, ExplodedNode *Pred,
ExplodedNodeSet& Dst); ExplodedNodeSet& Dst);
void VisitInitListExpr(InitListExpr* E, ExplodedNode* Pred, void VisitInitListExpr(InitListExpr* E, ExplodedNode* Pred,
ExplodedNodeSet& Dst); ExplodedNodeSet& Dst);

18
clang/lib/Analysis/GRExprEngine.cpp
View File

@ -665,7 +665,7 @@ void GRExprEngine::Visit(Stmt* S, ExplodedNode* Pred, ExplodedNodeSet& Dst) {
case Stmt::IfStmtClass: case Stmt::IfStmtClass:
// This case isn't for branch processing, but for handling the // This case isn't for branch processing, but for handling the
// initialization of a condition variable. // initialization of a condition variable.
VisitIfStmtCondInit(cast<IfStmt>(S), Pred, Dst); VisitCondInit(cast<IfStmt>(S)->getConditionVariable(), S, Pred, Dst);
break; break;
case Stmt::InitListExprClass: case Stmt::InitListExprClass:
@ -733,6 +733,12 @@ void GRExprEngine::Visit(Stmt* S, ExplodedNode* Pred, ExplodedNodeSet& Dst) {
case Stmt::StringLiteralClass: case Stmt::StringLiteralClass:
VisitLValue(cast<StringLiteral>(S), Pred, Dst); VisitLValue(cast<StringLiteral>(S), Pred, Dst);
break; break;
case Stmt::SwitchStmtClass:
// This case isn't for branch processing, but for handling the
// initialization of a condition variable.
VisitCondInit(cast<SwitchStmt>(S)->getConditionVariable(), S, Pred, Dst);
break;
case Stmt::UnaryOperatorClass: { case Stmt::UnaryOperatorClass: {
UnaryOperator *U = cast<UnaryOperator>(S); UnaryOperator *U = cast<UnaryOperator>(S);
@ -2230,12 +2236,10 @@ void GRExprEngine::VisitDeclStmt(DeclStmt *DS, ExplodedNode *Pred,
} }
} }
void GRExprEngine::VisitIfStmtCondInit(IfStmt *IS, ExplodedNode *Pred, void GRExprEngine::VisitCondInit(VarDecl *VD, Stmt *S,
ExplodedNodeSet& Dst) { ExplodedNode *Pred, ExplodedNodeSet& Dst) {
VarDecl* VD = IS->getConditionVariable();
Expr* InitEx = VD->getInit();
Expr* InitEx = VD->getInit();
ExplodedNodeSet Tmp; ExplodedNodeSet Tmp;
Visit(InitEx, Pred, Tmp); Visit(InitEx, Pred, Tmp);
@ -2255,7 +2259,7 @@ void GRExprEngine::VisitIfStmtCondInit(IfStmt *IS, ExplodedNode *Pred,
Builder->getCurrentBlockCount()); Builder->getCurrentBlockCount());
} }
EvalBind(Dst, IS, IS, N, state, EvalBind(Dst, S, S, N, state,
loc::MemRegionVal(state->getRegion(VD, LC)), InitVal, true); loc::MemRegionVal(state->getRegion(VD, LC)), InitVal, true);
} }
} }

18
clang/test/Analysis/misc-ps-region-store.cpp
View File

@ -41,3 +41,21 @@ int test_init_in_condition() {
} }
return 0; return 0;
} }
int test_init_in_condition_switch() {
switch (int x = test_init_in_condition_aux()) { // no-warning
case 1:
return 0;
case 2:
if (x == 2)
return 0;
else {
// Unreachable.
int *p = 0;
*p = 0xDEADBEEF; // no-warning
}
default:
break;
}
return 0;
}