Revert r75281 and simply remove the assertion in NewCastRegion that
CodeTextRegions can only be casted to FunctionPointer or BlockPointerTypes. This
simply isn't true. We can handle bogus operations on CodeTextRegions (e.g, an
array access) elsewhere.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@75285 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/Store.cpp b/lib/Analysis/Store.cpp
index ad6bd7e..7101b34 100644
--- a/lib/Analysis/Store.cpp
+++ b/lib/Analysis/Store.cpp
@@ -45,24 +45,6 @@
return true;
}
-static bool isVoidOrHigherOrderVoidPtr(ASTContext &Ctx, QualType Ty) {
- while (true) {
- Ty = Ctx.getCanonicalType(Ty);
-
- if (Ty->isVoidType())
- return true;
-
- if (const PointerType *PT = Ty->getAsPointerType()) {
- Ty = PT->getPointeeType();
- continue;
- }
-
- break;
- }
-
- return false;
-}
-
StoreManager::CastResult
StoreManager::NewCastRegion(const GRState *state, const MemRegion* R,
QualType CastToTy) {
@@ -82,10 +64,6 @@
// already be handled.
QualType PointeeTy = CastToTy->getAsPointerType()->getPointeeType();
- // Casts to 'void*', 'void**', 'void***', etc., should just pass through.
- if (isVoidOrHigherOrderVoidPtr(Ctx, PointeeTy))
- return CastResult(state, R);
-
// Process region cast according to the kind of the region being cast.
switch (R->getKind()) {
case MemRegion::BEG_TYPED_REGIONS:
@@ -99,9 +77,9 @@
}
case MemRegion::CodeTextRegionKind: {
- // CodeTextRegion should be cast to only function pointer type.
- assert(CastToTy->isFunctionPointerType() ||
- CastToTy->isBlockPointerType());
+ // CodeTextRegion should be cast to only function pointer type, although
+ // they can in practice be casted to anything, e.g, void*, char*, etc.
+ // Just pass the region through.
break;
}