diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-01-08 21:30:32 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-01-08 21:30:32 +0000 |
| commit | c231fab7563b716b47020022369a374045aac144 (patch) | |
| tree | 69e44300824094faa85b4af110cb72e57a68394c | |
| parent | 8a3052eab034e942ece6cb6ce7d757cf100b6112 (diff) | |
| download | bcm5719-llvm-c231fab7563b716b47020022369a374045aac144.tar.gz bcm5719-llvm-c231fab7563b716b47020022369a374045aac144.zip | |
Don't crash when trying to apply the availability attribute to a block.
llvm-svn: 171899
| -rw-r--r-- | clang/lib/Sema/SemaDeclAttr.cpp | 7 | ||||
| -rw-r--r-- | clang/test/Sema/attr-availability.c | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp index b62a4e86b11..75268b8cc5a 100644 --- a/clang/lib/Sema/SemaDeclAttr.cpp +++ b/clang/lib/Sema/SemaDeclAttr.cpp @@ -2131,6 +2131,12 @@ static void handleAvailabilityAttr(Sema &S, Decl *D, S.Diag(PlatformLoc, diag::warn_availability_unknown_platform) << Platform; + NamedDecl *ND = dyn_cast<NamedDecl>(D); + if (!ND) { + S.Diag(Attr.getLoc(), diag::warn_attribute_ignored) << Attr.getName(); + return; + } + AvailabilityChange Introduced = Attr.getAvailabilityIntroduced(); AvailabilityChange Deprecated = Attr.getAvailabilityDeprecated(); AvailabilityChange Obsoleted = Attr.getAvailabilityObsoleted(); @@ -2149,7 +2155,6 @@ static void handleAvailabilityAttr(Sema &S, Decl *D, IsUnavailable, Str); if (NewAttr) { D->addAttr(NewAttr); - NamedDecl *ND = cast<NamedDecl>(D); ND->ClearLVCache(); } } diff --git a/clang/test/Sema/attr-availability.c b/clang/test/Sema/attr-availability.c index 1d4b0efed64..805aef804b6 100644 --- a/clang/test/Sema/attr-availability.c +++ b/clang/test/Sema/attr-availability.c @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -triple x86_64-apple-darwin9 -fsyntax-only -verify %s +// RUN: %clang_cc1 -triple x86_64-apple-darwin9 -fsyntax-only -fblocks -verify %s void f0() __attribute__((availability(macosx,introduced=10.4,deprecated=10.2))); // expected-warning{{feature cannot be deprecated in OS X version 10.2 before it was introduced in version 10.4; attribute ignored}} void f1() __attribute__((availability(ios,obsoleted=2.1,deprecated=3.0))); // expected-warning{{feature cannot be obsoleted in iOS version 2.1 before it was deprecated in version 3.0; attribute ignored}} @@ -46,3 +46,8 @@ void f7(int) __attribute__((availability(ios,deprecated=4.0))); // expected-warn extern int x __attribute__((availability(macosx,introduced=10.5))); extern int x; + +void f8() { + int (^b)(int); + b = ^ (int i) __attribute__((availability(macosx,introduced=10.2))) { return 1; }; // expected-warning {{'availability' attribute ignored}} +} |
