MemRegion:
- Have 'TypedRegion::getRValueType()' return a null QualType for 'id<...>'
instead of aborting.
- Change 'TypedRegion::isBoundable()' to return true for all objects with a
non-null RValueType (this may not be the final behavior).
llvm-svn: 66093
diff --git a/clang/include/clang/Analysis/PathSensitive/MemRegion.h b/clang/include/clang/Analysis/PathSensitive/MemRegion.h
index 743a3b9..2ddaa20 100644
--- a/clang/include/clang/Analysis/PathSensitive/MemRegion.h
+++ b/clang/include/clang/Analysis/PathSensitive/MemRegion.h
@@ -154,18 +154,16 @@
}
QualType getDesugaredRValueType(ASTContext& C) const {
- return getRValueType(C)->getDesugaredType();
+ QualType T = getRValueType(C);
+ return T.getTypePtr() ? T->getDesugaredType() : T;
}
QualType getDesugaredLValueType(ASTContext& C) const {
return getLValueType(C)->getDesugaredType();
}
-
+
bool isBoundable(ASTContext &C) const {
- // FIXME: This needs to be adjusted for structures and arrays.
- // All this will reject right now is ObjCQualifiedIdType and
- // BlockPointerType.
- return getLValueType(C)->isPointerType();
+ return !getRValueType(C).isNull();
}
static bool classof(const MemRegion* R) {
diff --git a/clang/lib/Analysis/MemRegion.cpp b/clang/lib/Analysis/MemRegion.cpp
index 8dd31b5..c304b65 100644
--- a/clang/lib/Analysis/MemRegion.cpp
+++ b/clang/lib/Analysis/MemRegion.cpp
@@ -123,8 +123,9 @@
if (const BlockPointerType* PTy = T->getAsBlockPointerType())
return PTy->getPointeeType();
- assert(!T->getAsObjCQualifiedIdType() &&
- "There is no rvalue type for id<...>");
+ // There is no rvalue type of id<...>.
+ if (T->getAsObjCQualifiedIdType())
+ return QualType();
assert(Loc::IsLocType(T) && "Non-location type.");
return QualType();