diff options
author | George Karpenkov <ekarpenkov@apple.com> | 2019-01-10 18:14:25 +0000 |
---|---|---|
committer | George Karpenkov <ekarpenkov@apple.com> | 2019-01-10 18:14:25 +0000 |
commit | 61ebd71625b5146e235c51856b038dfea43207fb (patch) | |
tree | 8583113cd77248a416b4819b9cc802132b75546f | |
parent | 08e4f3dd6e207579c04e631cd07aa93b4178daab (diff) |
[analyzer] [RetainCountChecker] Remove obsolete "MakeCollectable" enum value
Differential Revision: https://reviews.llvm.org/D56071
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@350860 91177308-0d34-0410-b5e6-96231b3b80d8
3 files changed, 1 insertions, 11 deletions
diff --git a/include/clang/StaticAnalyzer/Core/RetainSummaryManager.h b/include/clang/StaticAnalyzer/Core/RetainSummaryManager.h index 099b20f611..e03a17067c 100644 --- a/include/clang/StaticAnalyzer/Core/RetainSummaryManager.h +++ b/include/clang/StaticAnalyzer/Core/RetainSummaryManager.h @@ -76,10 +76,6 @@ enum ArgEffectKind { /// if CFRetain has been called on the argument. IncRef, - /// The argument acts as if has been passed to CFMakeCollectable, which - /// transfers the object to the Garbage Collector under GC. - MakeCollectable, - /// The argument is a pointer to a retain-counted object; on exit, the new /// value of the pointer is a +0 value or NULL. UnretainedOutParameter, diff --git a/lib/StaticAnalyzer/Checkers/RetainCountChecker/RetainCountChecker.cpp b/lib/StaticAnalyzer/Checkers/RetainCountChecker/RetainCountChecker.cpp index 73de9f5b50..4e6fd8490d 100644 --- a/lib/StaticAnalyzer/Checkers/RetainCountChecker/RetainCountChecker.cpp +++ b/lib/StaticAnalyzer/Checkers/RetainCountChecker/RetainCountChecker.cpp @@ -730,8 +730,6 @@ ProgramStateRef RetainCountChecker::updateSymbol(ProgramStateRef state, break; } } - if (AE.getKind() == MakeCollectable) - AE = AE.withKind(DoNothing); // Handle all use-after-releases. if (V.getKind() == RefVal::Released) { @@ -741,9 +739,6 @@ ProgramStateRef RetainCountChecker::updateSymbol(ProgramStateRef state, } switch (AE.getKind()) { - case MakeCollectable: - llvm_unreachable("MakeCollectable already converted"); - case UnretainedOutParameter: case RetainedOutParameter: llvm_unreachable("Applies to pointer-to-pointer parameters, which should " diff --git a/lib/StaticAnalyzer/Core/RetainSummaryManager.cpp b/lib/StaticAnalyzer/Core/RetainSummaryManager.cpp index 20dc900e25..6f0a71bdd7 100644 --- a/lib/StaticAnalyzer/Core/RetainSummaryManager.cpp +++ b/lib/StaticAnalyzer/Core/RetainSummaryManager.cpp @@ -457,7 +457,6 @@ static ArgEffect getStopTrackingHardEquivalent(ArgEffect E) { case Autorelease: case DecRefBridgedTransferred: case IncRef: - case MakeCollectable: case UnretainedOutParameter: case RetainedOutParameter: case MayEscape: @@ -665,7 +664,7 @@ RetainSummaryManager::getUnarySummary(const FunctionType* FT, case cfretain: Effect = Effect.withKind(IncRef); break; case cfrelease: Effect = Effect.withKind(DecRef); break; case cfautorelease: Effect = Effect.withKind(Autorelease); break; - case cfmakecollectable: Effect = Effect.withKind(MakeCollectable); break; + case cfmakecollectable: Effect = Effect.withKind(DoNothing); break; } ScratchArgs = AF.add(ScratchArgs, 0, Effect); |