From a71ec6c00a181bc68ace4edb130bdcf6d9feb66e Mon Sep 17 00:00:00 2001 From: George Karpenkov Date: Thu, 6 Dec 2018 22:06:44 +0000 Subject: [PATCH] [analyzer] Fix an infinite recursion bug while checking parent methods in RetainCountChecker Differential Revision: https://reviews.llvm.org/D55351 llvm-svn: 348531 --- clang/lib/StaticAnalyzer/Core/RetainSummaryManager.cpp | 2 +- clang/test/Analysis/osobject-retain-release.cpp | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/clang/lib/StaticAnalyzer/Core/RetainSummaryManager.cpp b/clang/lib/StaticAnalyzer/Core/RetainSummaryManager.cpp index 2bdfd2d..0e82d9a 100644 --- a/clang/lib/StaticAnalyzer/Core/RetainSummaryManager.cpp +++ b/clang/lib/StaticAnalyzer/Core/RetainSummaryManager.cpp @@ -730,7 +730,7 @@ bool applyFunctionParamAnnotationEffect(const ParmVarDecl *pd, if (const auto *MD = dyn_cast(FD)) { for (const auto *OD : MD->overridden_methods()) { const ParmVarDecl *OP = OD->parameters()[parm_idx]; - if (applyFunctionParamAnnotationEffect(OP, parm_idx, MD, AF, Template)) + if (applyFunctionParamAnnotationEffect(OP, parm_idx, OD, AF, Template)) return true; } } diff --git a/clang/test/Analysis/osobject-retain-release.cpp b/clang/test/Analysis/osobject-retain-release.cpp index 398857f..a596d0d 100644 --- a/clang/test/Analysis/osobject-retain-release.cpp +++ b/clang/test/Analysis/osobject-retain-release.cpp @@ -45,6 +45,8 @@ struct OSArray : public OSObject { OSObject *identity() override; + virtual OSObject *generateObject(OSObject *input); + virtual void consumeReference(OS_CONSUME OSArray *other); static OSArray *generateArrayHasCode() { @@ -68,6 +70,8 @@ struct MyArray : public OSArray { void consumeReference(OSArray *other) override; OSObject *identity() override; + + OSObject *generateObject(OSObject *input) override; }; struct OtherStruct { @@ -79,6 +83,14 @@ struct OSMetaClassBase { static OSObject *safeMetaCast(const OSObject *inst, const OSMetaClass *meta); }; +void test_no_infinite_check_recursion(MyArray *arr) { + OSObject *input = new OSObject; + OSObject *o = arr->generateObject(input); + o->release(); + input->release(); +} + + void check_param_attribute_propagation(MyArray *parent) { OSArray *arr = new OSArray; parent->consumeReference(arr); -- 2.7.4