[PATCH] D76704: Don't normalise CXX11/C2X attribute names to start with ::
John Brawn via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Wed Mar 25 08:05:01 PDT 2020
This revision was automatically updated to reflect the committed changes.
Closed by commit rGbc3f171090f6: Don't normalise CXX11/C2X attribute names to start with :: (authored by john.brawn).
Changed prior to commit:
https://reviews.llvm.org/D76704?vs=252308&id=252578#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D76704/new/
https://reviews.llvm.org/D76704
Files:
clang/lib/Basic/Attributes.cpp
clang/utils/TableGen/ClangAttrEmitter.cpp
Index: clang/utils/TableGen/ClangAttrEmitter.cpp
===================================================================
--- clang/utils/TableGen/ClangAttrEmitter.cpp
+++ clang/utils/TableGen/ClangAttrEmitter.cpp
@@ -3739,10 +3739,8 @@
for (const auto &S : GetFlattenedSpellings(Attr)) {
const std::string &RawSpelling = S.name();
std::string Spelling;
- if (S.variety() == "CXX11" || S.variety() == "C2x") {
- Spelling += S.nameSpace();
- Spelling += "::";
- }
+ if (!S.nameSpace().empty())
+ Spelling += S.nameSpace() + "::";
if (S.variety() == "GNU")
Spelling += NormalizeGNUAttrSpelling(RawSpelling);
else
@@ -3815,12 +3813,12 @@
const std::string &Variety = S.variety();
if (Variety == "CXX11") {
Matches = &CXX11;
- Spelling += S.nameSpace();
- Spelling += "::";
+ if (!S.nameSpace().empty())
+ Spelling += S.nameSpace() + "::";
} else if (Variety == "C2x") {
Matches = &C2x;
- Spelling += S.nameSpace();
- Spelling += "::";
+ if (!S.nameSpace().empty())
+ Spelling += S.nameSpace() + "::";
} else if (Variety == "GNU")
Matches = &GNU;
else if (Variety == "Declspec")
Index: clang/lib/Basic/Attributes.cpp
===================================================================
--- clang/lib/Basic/Attributes.cpp
+++ clang/lib/Basic/Attributes.cpp
@@ -85,12 +85,12 @@
StringRef ScopeName = normalizeAttrScopeName(Scope, SyntaxUsed);
StringRef AttrName = normalizeAttrName(Name, ScopeName, SyntaxUsed);
- // Ensure that in the case of C++11 attributes, we look for '::foo' if it is
- // unscoped.
SmallString<64> FullName = ScopeName;
- if (Scope || SyntaxUsed == AttributeCommonInfo::AS_CXX11 ||
- SyntaxUsed == AttributeCommonInfo::AS_C2x)
+ if (!ScopeName.empty()) {
+ assert(SyntaxUsed == AttributeCommonInfo::AS_CXX11 ||
+ SyntaxUsed == AttributeCommonInfo::AS_C2X);
FullName += "::";
+ }
FullName += AttrName;
return FullName;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D76704.252578.patch
Type: text/x-patch
Size: 2109 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20200325/b5baf03a/attachment.bin>
More information about the cfe-commits
mailing list