Author: rafael
Date: Tue Jan 8 15:30:32 2013
New Revision: 171899
URL: http://llvm.org/viewvc/llvm-project?rev=171899&view=rev
Log:
Don't crash when trying to apply the availability attribute to a block.
Modified:
cfe/trunk/lib/Sema/SemaDeclAttr.cpp
cfe/trunk/test/Sema/attr-availability.c
Modified: cfe/trunk/lib/Sema/SemaDeclAttr.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclAttr.cpp?rev=171899&r1=171898&r2=171899&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclAttr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclAttr.cpp Tue Jan 8 15:30:32 2013
@@ -2131,6 +2131,12 @@
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 @@
IsUnavailable, Str);
if (NewAttr) {
D->addAttr(NewAttr);
- NamedDecl *ND = cast<NamedDecl>(D);
ND->ClearLVCache();
}
}
Modified: cfe/trunk/test/Sema/attr-availability.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/attr-availability.c?rev=171899&r1=171898&r2=171899&view=diff
==============================================================================
--- cfe/trunk/test/Sema/attr-availability.c (original)
+++ cfe/trunk/test/Sema/attr-availability.c Tue Jan 8 15:30:32 2013
@@ -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 @@
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}}
+}
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
