diff options
| -rw-r--r-- | clang/lib/AST/DeclObjC.cpp | 4 | ||||
| -rw-r--r-- | clang/test/SemaObjC/arc.m | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/clang/lib/AST/DeclObjC.cpp b/clang/lib/AST/DeclObjC.cpp index 7eb2688134b..5c4d25fd026 100644 --- a/clang/lib/AST/DeclObjC.cpp +++ b/clang/lib/AST/DeclObjC.cpp @@ -577,13 +577,13 @@ void ObjCMethodDecl::createImplicitParams(ASTContext &Context, selfIsConsumed = hasAttr<NSConsumesSelfAttr>(); // 'self' is always __strong. It's actually pseudo-strong except - // in init methods, though. + // in init methods (or methods labeled ns_consumes_self), though. Qualifiers qs; qs.setObjCLifetime(Qualifiers::OCL_Strong); selfTy = Context.getQualifiedType(selfTy, qs); // In addition, 'self' is const unless this is an init method. - if (getMethodFamily() != OMF_init) { + if (getMethodFamily() != OMF_init && !selfIsConsumed) { selfTy = selfTy.withConst(); selfIsPseudoStrong = true; } diff --git a/clang/test/SemaObjC/arc.m b/clang/test/SemaObjC/arc.m index 3f4c406458f..d146d8fad1d 100644 --- a/clang/test/SemaObjC/arc.m +++ b/clang/test/SemaObjC/arc.m @@ -294,6 +294,16 @@ void test12(id collection) { } @end +// <rdar://problem/10274056> +@interface Test13_B +- (id) consumesSelf __attribute__((ns_consumes_self)); +@end +@implementation Test13_B +- (id) consumesSelf { + self = 0; // no-warning +} +@end + // rdar://problem/9172151 @class Test14A, Test14B; void test14() { |
