diff options
| author | Douglas Gregor <dgregor@apple.com> | 2015-11-03 01:15:46 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2015-11-03 01:15:46 +0000 |
| commit | 249d7a566d3169e9f75918c3a0170cf90662224f (patch) | |
| tree | 5a32b44955ab9aa8b816c990a4729a5988a731b8 /test/FixIt | |
| parent | 97e5436f69f1bfa7f3e7fd2ecd80cdee0ae95bef (diff) | |
Stop back-patching 'readonly' Objective-C properties with 'readwrite' ones.
A 'readonly' Objective-C property declared in the primary class can
effectively be shadowed by a 'readwrite' property declared within an
extension of that class, so long as the types and attributes of the
two property declarations are compatible.
Previously, this functionality was implemented by back-patching the
original 'readonly' property to make it 'readwrite', destroying source
information and causing some hideously redundant, incorrect
code. Simplify the implementation to express how this should actually
be modeled: as a separate property declaration in the extension that
shadows (via the name lookup rules) the declaration in the primary
class. While here, correct some broken Fix-Its, eliminate a pile of
redundant code, clean up the ARC migrator's handling of properties
declared in extensions, and fix debug info's naming of methods that
come from categories.
A wonderous side effect of doing this write is that it eliminates the
"AddedObjCPropertyInClassExtension" method from the AST mutation
listener, which in turn eliminates the last place where we rewrite
entire declarations in a chained PCH file or a module file. This
change (which fixes rdar://problem/18475765) will allow us to
eliminate the rewritten-decls logic from the serialization library,
and fixes a crash (rdar://problem/23247794) illustrated by the
test/PCH/chain-categories.m example.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@251874 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/FixIt')
| -rw-r--r-- | test/FixIt/atomic-property.m | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/FixIt/atomic-property.m b/test/FixIt/atomic-property.m index 9ede7f1e76..84dd820e1c 100644 --- a/test/FixIt/atomic-property.m +++ b/test/FixIt/atomic-property.m @@ -23,7 +23,7 @@ - (id) atomic_prop1 { return 0; } @end -// CHECK: {4:1-4:10}:"@property (nonatomic) " -// CHECK: {9:1-9:12}:"@property (nonatomic" -// CHECK: {13:1-13:12}:"@property (nonatomic, " +// CHECK-DAG: {4:11-4:11}:"(nonatomic) " +// CHECK-DAG: {9:12-9:12}:"nonatomic" +// CHECK-DAG: {13:12-13:12}:"nonatomic, " |