diff options
3 files changed, 1 insertions, 11 deletions
diff --git a/clang/include/clang/StaticAnalyzer/Core/RetainSummaryManager.h b/clang/include/clang/StaticAnalyzer/Core/RetainSummaryManager.h index 099b20f611a..e03a17067c3 100644 --- a/clang/include/clang/StaticAnalyzer/Core/RetainSummaryManager.h +++ b/clang/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/clang/lib/StaticAnalyzer/Checkers/RetainCountChecker/RetainCountChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/RetainCountChecker/RetainCountChecker.cpp index 73de9f5b509..4e6fd8490d0 100644 --- a/clang/lib/StaticAnalyzer/Checkers/RetainCountChecker/RetainCountChecker.cpp +++ b/clang/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/clang/lib/StaticAnalyzer/Core/RetainSummaryManager.cpp b/clang/lib/StaticAnalyzer/Core/RetainSummaryManager.cpp index 20dc900e254..6f0a71bdd70 100644 --- a/clang/lib/StaticAnalyzer/Core/RetainSummaryManager.cpp +++ b/clang/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); |
