maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Add a C++11 and C2x spelling for the availability attribute in the clang vendor namespace. 

This attribute has custom parsing rules that previously prevented it from being supported with square bracket notation. Rework the clang attribute argument parsing to be more easily extended for other custom-parsed attributes.

llvm-svn: 326036
This commit is contained in:
Aaron Ballman 2018-02-24 17:16:42 +00:00
parent 4137bc68a4
commit 38bbc16a8b
3 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/include/clang/Basic/Attr.td
View File

@ -673,9 +673,7 @@ def AsmLabel : InheritableAttr {
}
def Availability : InheritableAttr {
// TODO: does not have a [[]] spelling because it requires custom parsing
// support.
let Spellings = [GNU<"availability">];
let Spellings = [Clang<"availability", 1>];
let Args = [IdentifierArgument<"platform">, VersionArgument<"introduced">,
VersionArgument<"deprecated">, VersionArgument<"obsoleted">,
BoolArgument<"unavailable">, StringArgument<"message">,

16
clang/lib/Parse/ParseDecl.cpp
View File

@ -404,14 +404,20 @@ unsigned Parser::ParseClangAttributeArgs(
AttributeList::Kind AttrKind =
AttributeList::getKind(AttrName, ScopeName, Syntax);
if (AttrKind == AttributeList::AT_ExternalSourceSymbol) {
switch (AttrKind) {
default:
return ParseAttributeArgsCommon(AttrName, AttrNameLoc, Attrs, EndLoc,
ScopeName, ScopeLoc, Syntax);
case AttributeList::AT_ExternalSourceSymbol:
ParseExternalSourceSymbolAttribute(*AttrName, AttrNameLoc, Attrs, EndLoc,
ScopeName, ScopeLoc, Syntax);
return Attrs.getList() ? Attrs.getList()->getNumArgs() : 0;
break;
case AttributeList::AT_Availability:
ParseAvailabilityAttribute(*AttrName, AttrNameLoc, Attrs, EndLoc, ScopeName,
ScopeLoc, Syntax);
break;
}
return ParseAttributeArgsCommon(AttrName, AttrNameLoc, Attrs, EndLoc,
ScopeName, ScopeLoc, Syntax);
return Attrs.getList() ? Attrs.getList()->getNumArgs() : 0;
}
bool Parser::ParseMicrosoftDeclSpecArgs(IdentifierInfo *AttrName,

25
clang/test/Sema/attr-availability-square-brackets.c Normal file
View File

@ -0,0 +1,25 @@
// RUN: %clang_cc1 -triple x86_64-apple-darwin9 -fsyntax-only -fdouble-square-bracket-attributes -verify %s
void f0() [[clang::availability(macosx,introduced=10.4,deprecated=10.2)]]; // expected-warning{{feature cannot be deprecated in macOS version 10.2 before it was introduced in version 10.4; attribute ignored}}
void f1() [[clang::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}}
void f2() [[clang::availability(ios,introduced=2.1,deprecated=2.1)]];
extern void
ATSFontGetName(const char *oName) [[clang::availability(macosx,introduced=8.0,deprecated=9.0, message="use CTFontCopyFullName")]]; // expected-note {{'ATSFontGetName' has been explicitly marked deprecated here}}
void test_10095131() {
ATSFontGetName("Hello"); // expected-warning {{'ATSFontGetName' is deprecated: first deprecated in macOS 9.0 - use CTFontCopyFullName}}
}
enum
[[clang::availability(macos, unavailable)]]
{
NSDataWritingFileProtectionWriteOnly = 0x30000000,
NSDataWritingFileProtectionCompleteUntilUserAuthentication = 0x40000000,
};
extern int x [[clang::availability(macosx,introduced=10.5)]];
extern int x;
int i [[clang::availability(this, should = 1.0)]]; // expected-error {{'should' is not an availability stage; use 'introduced', 'deprecated', or 'obsoleted'}} \
// expected-warning {{unknown platform 'this' in availability macro}}