diff options
| -rw-r--r-- | clang/lib/Analysis/BasicStore.cpp | 22 | ||||
| -rw-r--r-- | clang/lib/Analysis/SVals.cpp | 13 | ||||
| -rw-r--r-- | clang/test/Analysis/misc-ps.m | 6 |
3 files changed, 25 insertions, 16 deletions
diff --git a/clang/lib/Analysis/BasicStore.cpp b/clang/lib/Analysis/BasicStore.cpp index 8cfe7a98401..b883f880614 100644 --- a/clang/lib/Analysis/BasicStore.cpp +++ b/clang/lib/Analysis/BasicStore.cpp @@ -526,19 +526,15 @@ Store BasicStoreManager::getInitialStore() { if (VD->getStorageClass() == VarDecl::Static) continue; - // Only handle pointers and integers for now. - QualType T = VD->getType(); - if (Loc::IsLocType(T) || T->isIntegerType()) { - // Initialize globals and parameters to symbolic values. - // Initialize local variables to undefined. - const MemRegion *R = StateMgr.getRegion(VD); - SVal X = (VD->hasGlobalStorage() || isa<ParmVarDecl>(VD) || - isa<ImplicitParamDecl>(VD)) - ? SVal::GetRValueSymbolVal(StateMgr.getSymbolManager(), R) - : UndefinedVal(); - - St = BindInternal(St, Loc::MakeVal(R), X); - } + // Initialize globals and parameters to symbolic values. + // Initialize local variables to undefined. + const MemRegion *R = StateMgr.getRegion(VD); + SVal X = (VD->hasGlobalStorage() || isa<ParmVarDecl>(VD) || + isa<ImplicitParamDecl>(VD)) + ? SVal::GetRValueSymbolVal(StateMgr.getSymbolManager(), R) + : UndefinedVal(); + + St = BindInternal(St, Loc::MakeVal(R), X); } } return St; diff --git a/clang/lib/Analysis/SVals.cpp b/clang/lib/Analysis/SVals.cpp index cca0e94191d..3762ae5ce61 100644 --- a/clang/lib/Analysis/SVals.cpp +++ b/clang/lib/Analysis/SVals.cpp @@ -324,11 +324,18 @@ NonLoc NonLoc::MakeCompoundVal(QualType T, llvm::ImmutableList<SVal> Vals, SVal SVal::GetRValueSymbolVal(SymbolManager& SymMgr, const MemRegion* R) { SymbolRef sym = SymMgr.getRegionRValueSymbol(R); - if (const TypedRegion* TR = dyn_cast<TypedRegion>(R)) - if (Loc::IsLocType(TR->getRValueType(SymMgr.getContext()))) + if (const TypedRegion* TR = dyn_cast<TypedRegion>(R)) { + QualType T = TR->getRValueType(SymMgr.getContext()); + + if (Loc::IsLocType(T)) return Loc::MakeVal(sym); - return NonLoc::MakeVal(sym); + // Only handle integers for now. + if (T->isIntegerType()) + return NonLoc::MakeVal(sym); + } + + return UnknownVal(); } nonloc::LocAsInteger nonloc::LocAsInteger::Make(BasicValueFactory& Vals, Loc V, diff --git a/clang/test/Analysis/misc-ps.m b/clang/test/Analysis/misc-ps.m index 08de2f4aac2..ae777a5e266 100644 --- a/clang/test/Analysis/misc-ps.m +++ b/clang/test/Analysis/misc-ps.m @@ -195,3 +195,9 @@ void pr3772(void) // PR 3780 - This tests that StmtIterator isn't broken for VLAs in DeclGroups. void pr3780(int sz) { typedef double MAT[sz][sz]; } +// <rdar://problem/6695527> - Test that we don't symbolicate doubles before +// we are ready to do something with them. +int rdar6695527(double x) { + if (!x) { return 0; } + return 1; +} |
