diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2012-03-22 17:39:35 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2012-03-22 17:39:35 +0000 |
| commit | 2df089d4d8d47c3d0d43325d5bb69ec49147f81f (patch) | |
| tree | 33e6652ead2ce26f45987704a23a441d0aa3abfc | |
| parent | 643586fe4fcd42b0978efd3566832ab4dce50367 (diff) | |
modern objective-c rewriter: Fix up translation of
property attributes. // rdar://11095151
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@153261 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Rewrite/RewriteModernObjC.cpp | 2 | ||||
| -rw-r--r-- | test/Rewriter/objc-modern-property-attributes.mm | 35 |
2 files changed, 36 insertions, 1 deletions
diff --git a/lib/Rewrite/RewriteModernObjC.cpp b/lib/Rewrite/RewriteModernObjC.cpp index f337f413e7..b406adcf51 100644 --- a/lib/Rewrite/RewriteModernObjC.cpp +++ b/lib/Rewrite/RewriteModernObjC.cpp @@ -6246,7 +6246,7 @@ void RewriteModernObjC::RewriteObjCClassMetaData(ObjCImplementationDecl *IDecl, ClassProperties.push_back(*I); Write_prop_list_t_initializer(*this, Context, Result, ClassProperties, - /* Container */0, + /* Container */IDecl, "_OBJC_$_PROP_LIST_", CDecl->getNameAsString()); diff --git a/test/Rewriter/objc-modern-property-attributes.mm b/test/Rewriter/objc-modern-property-attributes.mm new file mode 100644 index 0000000000..7d74a95e7d --- /dev/null +++ b/test/Rewriter/objc-modern-property-attributes.mm @@ -0,0 +1,35 @@ +// RUN: %clang_cc1 -E %s -o %t.mm +// RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %t.mm -o - | FileCheck %s + +// rdar://11095151 + +typedef void (^void_block_t)(void); + +@interface PropertyClass { + int q; + void_block_t __completion; + PropertyClass* YVAR; + id ID; +} +@property int q; +@property int r; + +@property (copy) void_block_t completionBlock; +@property (retain) PropertyClass* Yblock; +@property (copy) id ID; + +@end + +@implementation PropertyClass +@synthesize q; // attributes should be "Ti,Vq" +@dynamic r; // attributes should be "Ti,D" +@synthesize completionBlock=__completion; // "T@?,C,V__completion" +@synthesize Yblock = YVAR; // "T@\"PropertyClass\",&,VYVAR" +@synthesize ID; // "T@,C,VID" +@end + +// CHECK: Ti,Vq +// CHECK: Ti,D +// CHECK: T@?,C,V__completion +// CHECK: T@\"PropertyClass\",&,VYVAR + |