diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2011-11-08 23:09:34 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2011-11-08 23:09:34 +0000 |
| commit | 8b08eb34565a644d3345b1bfee3542a8f4a6c300 (patch) | |
| tree | 264b769b93a22a3c6ba307c5bcf638d1d4b251e4 /test/ARCMT | |
| parent | a5493f885095bd63d525a7035ad1c224de3ae5f2 (diff) | |
[arcmt] Take into account that all properties are strong-by-default now and fix the test.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@144146 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/ARCMT')
| -rw-r--r-- | test/ARCMT/assign-prop-with-arc-runtime.m | 5 | ||||
| -rw-r--r-- | test/ARCMT/assign-prop-with-arc-runtime.m.result | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/test/ARCMT/assign-prop-with-arc-runtime.m b/test/ARCMT/assign-prop-with-arc-runtime.m index 8845010895..8408a1858b 100644 --- a/test/ARCMT/assign-prop-with-arc-runtime.m +++ b/test/ARCMT/assign-prop-with-arc-runtime.m @@ -14,8 +14,7 @@ typedef _NSCachedAttributedString *BadClassForWeak; @class Forw; @interface Foo : NSObject { - Foo *w, *q1, *q2; - __weak Foo *x; + Foo *x, *w, *q1, *q2; WeakOptOut *oo; BadClassForWeak bcw; id not_safe1; @@ -23,7 +22,7 @@ typedef _NSCachedAttributedString *BadClassForWeak; Forw *not_safe3; Foo *assign_plus1; } -@property (readonly) __weak Foo *x; +@property (readonly) Foo *x; @property (assign) Foo *w; @property Foo *q1, *q2; @property (assign) WeakOptOut *oo; diff --git a/test/ARCMT/assign-prop-with-arc-runtime.m.result b/test/ARCMT/assign-prop-with-arc-runtime.m.result index 7cb7e1722b..56906f7002 100644 --- a/test/ARCMT/assign-prop-with-arc-runtime.m.result +++ b/test/ARCMT/assign-prop-with-arc-runtime.m.result @@ -14,8 +14,7 @@ typedef _NSCachedAttributedString *BadClassForWeak; @class Forw; @interface Foo : NSObject { - Foo *__weak w, *__weak q1, *__weak q2; - __weak Foo *x; + Foo *__weak x, *__weak w, *__weak q1, *__weak q2; WeakOptOut *__unsafe_unretained oo; BadClassForWeak __unsafe_unretained bcw; id __unsafe_unretained not_safe1; @@ -23,7 +22,7 @@ typedef _NSCachedAttributedString *BadClassForWeak; Forw *__unsafe_unretained not_safe3; Foo *assign_plus1; } -@property (readonly) __weak Foo *x; +@property (weak, readonly) Foo *x; @property (weak) Foo *w; @property (weak) Foo *q1, *q2; @property (unsafe_unretained) WeakOptOut *oo; @@ -58,12 +57,12 @@ typedef _NSCachedAttributedString *BadClassForWeak; @end @interface TestExt -@property (strong,readonly) TestExt *x1; +@property (readonly) TestExt *x1; @property (weak, readonly) TestExt *x2; @end @interface TestExt() -@property (strong,readwrite) TestExt *x1; +@property (readwrite) TestExt *x1; @property (weak, readwrite) TestExt *x2; @end |