Fix crash in StoreManager::NewCastRegion() when handling casts from 'id' (or whatever) to a BlockPointerType.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@76288 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/Store.cpp b/lib/Analysis/Store.cpp
index b939a0d..bd46a68 100644
--- a/lib/Analysis/Store.cpp
+++ b/lib/Analysis/Store.cpp
@@ -59,6 +59,23 @@
state = setCastType(state, R, CastToTy);
return CastResult(state, R);
}
+
+ if (CastToTy->isBlockPointerType()) {
+ if (isa<CodeTextRegion>(R))
+ return CastResult(state, R);
+
+ // FIXME: This may not be the right approach, depending on the symbol
+ // involved. Blocks can be casted to/from 'id', as they can be treated
+ // as Objective-C objects.
+ if (SymbolRef sym = loc::MemRegionVal(R).getAsSymbol()) {
+ R = MRMgr.getCodeTextRegion(sym, CastToTy);
+ return CastResult(state, R);
+ }
+
+ // We don't know what to make of it. Return a NULL region, which
+ // will be interpretted as UnknownVal.
+ return CastResult(state, NULL);
+ }
// Now assume we are casting from pointer to pointer. Other cases should
// already be handled.
@@ -77,8 +94,9 @@
}
case MemRegion::CodeTextRegionKind: {
- // CodeTextRegion should be cast to only function pointer type, although
- // they can in practice be casted to anything, e.g, void*, char*, etc.
+ // CodeTextRegion should be cast to only a function or block pointer type,
+ // although they can in practice be casted to anything, e.g, void*,
+ // char*, etc.
// Just pass the region through.
break;
}