Per conversations with Zhongxing, add an 'element type' to
ElementRegion. I also removed 'ElementRegion::getArrayRegion',
although we may need to add this back.
This breaks a few test cases with RegionStore:
- 'array-struct.c' triggers an infinite recursion in RegionStoreManager. Need to investigate.
- misc-ps.m triggers a failure with RegionStoreManager as we now get the diagnostic:
'Line 159: Uninitialized or undefined return value returned to caller.'
There were a bunch of places that needed to be edit
RegionStoreManager, and we may not be passing all the correct 'element
types' down from GRExprEngine.
Zhongxing: When you get a chance, could you review this? I could have
easily screwed up something basic in RegionStoreManager.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70830 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/RegionStore.cpp b/lib/Analysis/RegionStore.cpp
index 8f573c3..700174a 100644
--- a/lib/Analysis/RegionStore.cpp
+++ b/lib/Analysis/RegionStore.cpp
@@ -186,7 +186,8 @@
SVal getLValueFieldOrIvar(const GRState* St, SVal Base, const Decl* D);
- SVal getLValueElement(const GRState* St, SVal Base, SVal Offset);
+ SVal getLValueElement(const GRState* St, QualType elementType,
+ SVal Base, SVal Offset);
SVal getSizeInElements(const GRState* St, const MemRegion* R);
@@ -383,7 +384,8 @@
return loc::MemRegionVal(MRMgr.getFieldRegion(cast<FieldDecl>(D), BaseR));
}
-SVal RegionStoreManager::getLValueElement(const GRState* St,
+SVal RegionStoreManager::getLValueElement(const GRState* St,
+ QualType elementType,
SVal Base, SVal Offset) {
// If the base is an unknown or undefined value, just return it back.
@@ -430,7 +432,8 @@
Offset = NonLoc::MakeVal(getBasicVals(), Tmp);
}
}
- return loc::MemRegionVal(MRMgr.getElementRegion(Offset, BaseRegion));
+ return loc::MemRegionVal(MRMgr.getElementRegion(elementType, Offset,
+ BaseRegion));
}
SVal BaseIdx = ElemR->getIndex();
@@ -447,7 +450,7 @@
// can't we need to put a comment here. If it can, we should handle it.
assert(BaseIdxI.getBitWidth() >= OffI.getBitWidth());
- const TypedRegion *ArrayR = ElemR->getArrayRegion();
+ const TypedRegion *ArrayR = cast<TypedRegion>(ElemR->getSuperRegion());
SVal NewIdx;
if (OffI.isUnsigned() || OffI.getBitWidth() < BaseIdxI.getBitWidth()) {
@@ -465,7 +468,7 @@
else
NewIdx = nonloc::ConcreteInt(getBasicVals().getValue(BaseIdxI + OffI));
- return loc::MemRegionVal(MRMgr.getElementRegion(NewIdx, ArrayR));
+ return loc::MemRegionVal(MRMgr.getElementRegion(elementType, NewIdx, ArrayR));
}
SVal RegionStoreManager::getSizeInElements(const GRState* St,
@@ -568,8 +571,13 @@
if (!ArrayR)
return UnknownVal();
+ // Strip off typedefs from the ArrayRegion's RvalueType.
+ QualType T = ArrayR->getRValueType(getContext())->getDesugaredType();
+ ArrayType *AT = cast<ArrayType>(T);
+ T = AT->getElementType();
+
nonloc::ConcreteInt Idx(getBasicVals().getZeroWithPtrWidth(false));
- ElementRegion* ER = MRMgr.getElementRegion(Idx, ArrayR);
+ ElementRegion* ER = MRMgr.getElementRegion(T, Idx, ArrayR);
return loc::MemRegionVal(ER);
}
@@ -584,7 +592,6 @@
return UnknownVal();
const TypedRegion* TR = cast<TypedRegion>(MR);
-
const ElementRegion* ER = dyn_cast<ElementRegion>(TR);
if (!ER) {
@@ -594,7 +601,7 @@
// p += 3;
// Note that p binds to a TypedViewRegion(SymbolicRegion).
nonloc::ConcreteInt Idx(getBasicVals().getZeroWithPtrWidth(false));
- ER = MRMgr.getElementRegion(Idx, TR);
+ ER = MRMgr.getElementRegion(TR->getRValueType(getContext()), Idx, TR);
}
SVal Idx = ER->getIndex();
@@ -613,8 +620,9 @@
nonloc::ConcreteInt OffConverted(getBasicVals().Convert(Base->getValue(),
Offset->getValue()));
SVal NewIdx = Base->EvalBinOp(getBasicVals(), Op, OffConverted);
- const MemRegion* NewER = MRMgr.getElementRegion(NewIdx,
- ER->getArrayRegion());
+ const MemRegion* NewER =
+ MRMgr.getElementRegion(ER->getElementType(), NewIdx,
+ cast<TypedRegion>(ER->getSuperRegion()));
return Loc::MakeVal(NewER);
}
@@ -769,15 +777,15 @@
ConstantArrayType* CAT = cast<ConstantArrayType>(T.getTypePtr());
llvm::ImmutableList<SVal> ArrayVal = getBasicVals().getEmptySValList();
-
llvm::APSInt Size(CAT->getSize(), false);
llvm::APSInt i = getBasicVals().getValue(0, Size.getBitWidth(),
Size.isUnsigned());
for (; i < Size; ++i) {
SVal Idx = NonLoc::MakeVal(getBasicVals(), i);
- ElementRegion* ER = MRMgr.getElementRegion(Idx, R);
- QualType ETy = ER->getRValueType(getContext());
+ ElementRegion* ER = MRMgr.getElementRegion(R->getRValueType(getContext()),
+ Idx, R);
+ QualType ETy = ER->getElementType();
SVal ElementVal = Retrieve(St, loc::MemRegionVal(ER), ETy);
ArrayVal = getBasicVals().consVals(ElementVal, ArrayVal);
}
@@ -1059,7 +1067,9 @@
break;
SVal Idx = NonLoc::MakeVal(getBasicVals(), i);
- ElementRegion* ER = MRMgr.getElementRegion(Idx, R);
+ ElementRegion* ER =
+ MRMgr.getElementRegion(cast<ArrayType>(T)->getElementType(),
+ Idx, R);
SVal V = NonLoc::MakeVal(getBasicVals(), str[j], sizeof(char)*8, true);
St = Bind(St, loc::MemRegionVal(ER), V);
@@ -1068,9 +1078,7 @@
return St;
}
-
nonloc::CompoundVal& CV = cast<nonloc::CompoundVal>(Init);
-
nonloc::CompoundVal::iterator VI = CV.begin(), VE = CV.end();
for (; i < Size; ++i, ++VI) {
@@ -1079,7 +1087,9 @@
break;
SVal Idx = NonLoc::MakeVal(getBasicVals(), i);
- ElementRegion* ER = MRMgr.getElementRegion(Idx, R);
+ ElementRegion* ER =
+ MRMgr.getElementRegion(cast<ArrayType>(T)->getElementType(),
+ Idx, R);
if (CAT->getElementType()->isStructureType())
St = BindStruct(St, ER, *VI);