Author: aaronballman
Date: Wed Jan 3 14:22:48 2018
New Revision: 321763
URL: http://llvm.org/viewvc/llvm-project?rev=321763&view=rev
Log:
Introduce some infrastructure for adding C attributes with [[]] syntax.
This patch adds support to the attribute tablegen for specifying a [[]]
attribute is allowed in C mode. This patch also adds the annotate attribute to
the list of double square bracket attributes we support in C mode.
Eventually, I anticipate that this logic will be reversed (you have to opt out
of allowing an attribute in C rather than opting in), but I want to see how the
design plays out as more attributes are considered.
Modified:
cfe/trunk/include/clang/Basic/Attr.td
cfe/trunk/test/Sema/annotate.c
cfe/trunk/utils/TableGen/ClangAttrEmitter.cpp
Modified: cfe/trunk/include/clang/Basic/Attr.td
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/Attr.td?rev=321763&r1=321762&r2=321763&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/Attr.td (original)
+++ cfe/trunk/include/clang/Basic/Attr.td Wed Jan 3 14:22:48 2018
@@ -231,9 +231,12 @@ class GCC<string name> : Spelling<name,
let KnownToGCC = 1;
}
-// The Clang spelling implies GNU<name> and CXX11<"clang", name>. This spelling
-// should be used for any Clang-specific attributes.
-class Clang<string name> : Spelling<name, "Clang">;
+// The Clang spelling implies GNU<name>, CXX11<"clang", name>, and optionally,
+// C2x<"clang", name>. This spelling should be used for any Clang-specific
+// attributes.
+class Clang<string name, bit allowInC = 0> : Spelling<name, "Clang"> {
+ bit AllowInC = allowInC;
+}
class Accessor<string name, list<Spelling> spellings> {
string Name = name;
@@ -618,7 +621,7 @@ def AnalyzerNoReturn : InheritableAttr {
}
def Annotate : InheritableParamAttr {
- let Spellings = [Clang<"annotate">];
+ let Spellings = [Clang<"annotate", 1>];
let Args = [StringArgument<"Annotation">];
// Ensure that the annotate attribute can be used with
// '#pragma clang attribute' even though it has no subject list.
Modified: cfe/trunk/test/Sema/annotate.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/annotate.c?rev=321763&r1=321762&r2=321763&view=diff
==============================================================================
--- cfe/trunk/test/Sema/annotate.c (original)
+++ cfe/trunk/test/Sema/annotate.c Wed Jan 3 14:22:48 2018
@@ -1,9 +1,13 @@
-// RUN: %clang_cc1 %s -fsyntax-only -verify
+// RUN: %clang_cc1 %s -fsyntax-only -fdouble-square-bracket-attributes -verify
void __attribute__((annotate("foo"))) foo(float *a) {
__attribute__((annotate("bar"))) int x;
+ [[clang::annotate("bar")]] int x2;
__attribute__((annotate(1))) int y; // expected-error {{'annotate' attribute
requires a string}}
+ [[clang::annotate(1)]] int y2; // expected-error {{'annotate' attribute
requires a string}}
__attribute__((annotate("bar", 1))) int z; // expected-error {{'annotate'
attribute takes one argument}}
+ [[clang::annotate("bar", 1)]] int z2; // expected-error {{'annotate'
attribute takes one argument}}
+
int u = __builtin_annotation(z, (char*) 0); // expected-error {{second
argument to __builtin_annotation must be a non-wide string constant}}
int v = __builtin_annotation(z, (char*) L"bar"); // expected-error {{second
argument to __builtin_annotation must be a non-wide string constant}}
int w = __builtin_annotation(z, "foo");
Modified: cfe/trunk/utils/TableGen/ClangAttrEmitter.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/utils/TableGen/ClangAttrEmitter.cpp?rev=321763&r1=321762&r2=321763&view=diff
==============================================================================
--- cfe/trunk/utils/TableGen/ClangAttrEmitter.cpp (original)
+++ cfe/trunk/utils/TableGen/ClangAttrEmitter.cpp Wed Jan 3 14:22:48 2018
@@ -87,6 +87,8 @@ GetFlattenedSpellings(const Record &Attr
} else if (Variety == "Clang") {
Ret.emplace_back("GNU", Name, "", false);
Ret.emplace_back("CXX11", Name, "clang", false);
+ if (Spelling->getValueAsBit("AllowInC"))
+ Ret.emplace_back("C2x", Name, "clang", false);
} else
Ret.push_back(FlattenedSpelling(*Spelling));
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
