diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2011-09-30 20:50:23 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2011-09-30 20:50:23 +0000 |
| commit | 044a5be6fb376ccb81322dbd6ab5232d35f84da2 (patch) | |
| tree | c5bbf6abf7d3d7dee22f3b296e11254cbe4ef97b | |
| parent | 3bad73a900eb7e81ddb1b96985a6cecf3c5d985c (diff) | |
| download | bcm5719-llvm-044a5be6fb376ccb81322dbd6ab5232d35f84da2.tar.gz bcm5719-llvm-044a5be6fb376ccb81322dbd6ab5232d35f84da2.zip | |
objc arc: allow objc_returns_inner_pointer on methods that return
a reference type, since inner reference is much like an inner pointer.
// rdar://10139365
llvm-svn: 140880
| -rw-r--r-- | clang/lib/Sema/SemaDeclAttr.cpp | 4 | ||||
| -rw-r--r-- | clang/test/CodeGenObjCXX/arc-returns-inner-reference-ptr.mm | 22 |
2 files changed, 25 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp index 0ffb92f00f0..5802aaad968 100644 --- a/clang/lib/Sema/SemaDeclAttr.cpp +++ b/clang/lib/Sema/SemaDeclAttr.cpp @@ -3250,7 +3250,9 @@ static void handleObjCReturnsInnerPointerAttr(Sema &S, Decl *D, // Check that the method returns a normal pointer. QualType resultType = method->getResultType(); - if (!resultType->isPointerType() || resultType->isObjCRetainableType()) { + + if (!resultType->isReferenceType() && + (!resultType->isPointerType() || resultType->isObjCRetainableType())) { S.Diag(method->getLocStart(), diag::warn_ns_attribute_wrong_return_type) << SourceRange(loc) << attr.getName() << /*method*/ 1 << /*non-retainable pointer*/ 2; diff --git a/clang/test/CodeGenObjCXX/arc-returns-inner-reference-ptr.mm b/clang/test/CodeGenObjCXX/arc-returns-inner-reference-ptr.mm new file mode 100644 index 00000000000..06c83d8e701 --- /dev/null +++ b/clang/test/CodeGenObjCXX/arc-returns-inner-reference-ptr.mm @@ -0,0 +1,22 @@ +// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -emit-llvm -fobjc-nonfragile-abi -fobjc-arc -o - %s | FileCheck %s +// rdar://10139365 + +@interface Test58 +- (char* &) interior __attribute__((objc_returns_inner_pointer)); +- (int&)reference_to_interior_int __attribute__((objc_returns_inner_pointer)); +@end + +void foo() { + Test58 *ptr; + char *c = [(ptr) interior]; + + int i = [(ptr) reference_to_interior_int]; +} + +// CHECK: [[T0:%.*]] = load {{%.*}} {{%.*}}, align 8 +// CHECK: [[T1:%.*]] = bitcast {{%.*}} [[T0]] to i8* +// call i8* @objc_retainAutorelease(i8* [[T1]]) nounwind +// CHECK: [[T2:%.*]] = load {{%.*}} {{%.*}}, align 8 +// CHECK: [[T3:%.*]] = bitcast {{%.*}} [[T2]] to i8* +// call i8* @objc_retainAutorelease(i8* [[T3]]) nounwind + |
