diff options
| author | Douglas Gregor <dgregor@apple.com> | 2013-01-16 00:54:48 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2013-01-16 00:54:48 +0000 |
| commit | 43dc0c7d60c4aec6b2fee9f9b8bc5baf77d90841 (patch) | |
| tree | e07e082395ce5e0caefed2d261a475fc040fb58f /clang/test/SemaObjC | |
| parent | effe2a1e7532709d58fcfd21871ed3b6cd8df880 (diff) | |
| download | bcm5719-llvm-43dc0c7d60c4aec6b2fee9f9b8bc5baf77d90841.tar.gz bcm5719-llvm-43dc0c7d60c4aec6b2fee9f9b8bc5baf77d90841.zip | |
One can have an unavailable method overridden by an available method,
but not vice-versa. Fix bug introduced in r172567 and noticed by
Jordan, thanks!
llvm-svn: 172586
Diffstat (limited to 'clang/test/SemaObjC')
| -rw-r--r-- | clang/test/SemaObjC/attr-availability.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/test/SemaObjC/attr-availability.m b/clang/test/SemaObjC/attr-availability.m index 09057339065..bf7ef19bead 100644 --- a/clang/test/SemaObjC/attr-availability.m +++ b/clang/test/SemaObjC/attr-availability.m @@ -11,8 +11,8 @@ - (void)overridden2 __attribute__((availability(macosx,introduced=10.3))); - (void)overridden3 __attribute__((availability(macosx,deprecated=10.3))); - (void)overridden4 __attribute__((availability(macosx,deprecated=10.3))); // expected-note{{overridden method is here}} -- (void)overridden5 __attribute__((availability(macosx,unavailable))); // expected-note{{overridden method is here}} -- (void)overridden6 __attribute__((availability(macosx,introduced=10.3))); +- (void)overridden5 __attribute__((availability(macosx,unavailable))); +- (void)overridden6 __attribute__((availability(macosx,introduced=10.3))); // expected-note{{overridden method is here}} @end // rdar://11475360 @@ -22,8 +22,8 @@ - (void)overridden2 __attribute__((availability(macosx,introduced=10.2))); - (void)overridden3 __attribute__((availability(macosx,deprecated=10.4))); - (void)overridden4 __attribute__((availability(macosx,deprecated=10.2))); // expected-warning{{overriding method deprecated before overridden method on OS X (10.3 vs. 10.2)}} -- (void)overridden5 __attribute__((availability(macosx,introduced=10.3))); // expected-warning{{overriding method cannot be unavailable on OS X when its overridden method is available}} -- (void)overridden6 __attribute__((availability(macosx,unavailable))); +- (void)overridden5 __attribute__((availability(macosx,introduced=10.3))); +- (void)overridden6 __attribute__((availability(macosx,unavailable))); // expected-warning{{overriding method cannot be unavailable on OS X when its overridden method is available}} @end void f(A *a, B *b) { |
