replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't crash when trying to apply the availability attribute to a block. 

llvm-svn: 171899
This commit is contained in:
Rafael Espindola 2013-01-08 21:30:32 +00:00
parent 8a3052eab0
commit c231fab756
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/lib/Sema/SemaDeclAttr.cpp
View File

@ -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();
}
}

7
clang/test/Sema/attr-availability.c
View File

@ -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}}
}