This revision was not accepted when it landed; it landed in state "Needs
Review".
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG636dd1e8a178: Make explicit the single-argument constructors
of AttributeCommonInfo; NFC (authored by aaron.ballman).
Changed prior to commit:
https://reviews.llvm.org/D147661?vs=511425&id=512120#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D147661/new/
https://reviews.llvm.org/D147661
Files:
clang/include/clang/Basic/Attr.td
clang/include/clang/Basic/AttributeCommonInfo.h
clang/lib/Sema/SemaDeclAttr.cpp
clang/utils/TableGen/ClangAttrEmitter.cpp
Index: clang/utils/TableGen/ClangAttrEmitter.cpp
===================================================================
--- clang/utils/TableGen/ClangAttrEmitter.cpp
+++ clang/utils/TableGen/ClangAttrEmitter.cpp
@@ -2505,8 +2505,15 @@
return &R == P.second;
});
+ enum class CreateKind {
+ WithAttributeCommonInfo,
+ WithSourceRange,
+ WithNoArgs,
+ };
+
// Emit CreateImplicit factory methods.
- auto emitCreate = [&](bool Implicit, bool DelayedArgsOnly, bool emitFake) {
+ auto emitCreate = [&](bool Implicit, bool DelayedArgsOnly,
+ bool emitFake, CreateKind Kind) {
if (Header)
OS << " static ";
OS << R.getName() << "Attr *";
@@ -2530,9 +2537,10 @@
OS << ", ";
DelayedArgs->writeCtorParameters(OS);
}
- OS << ", const AttributeCommonInfo &CommonInfo";
- if (Header && Implicit)
- OS << " = {SourceRange{}}";
+ if (Kind == CreateKind::WithAttributeCommonInfo)
+ OS << ", const AttributeCommonInfo &CommonInfo";
+ else if (Kind == CreateKind::WithSourceRange)
+ OS << ", SourceRange R";
OS << ")";
if (Header) {
OS << ";\n";
@@ -2541,7 +2549,13 @@
OS << " {\n";
OS << " auto *A = new (Ctx) " << R.getName();
- OS << "Attr(Ctx, CommonInfo";
+ if (Kind == CreateKind::WithAttributeCommonInfo)
+ OS << "Attr(Ctx, CommonInfo";
+ else if (Kind == CreateKind::WithSourceRange)
+ OS << "Attr(Ctx, AttributeCommonInfo{R}";
+ else if (Kind == CreateKind::WithNoArgs)
+ OS << "Attr(Ctx, AttributeCommonInfo{SourceLocation{}}";
+
if (!DelayedArgsOnly) {
for (auto const &ai : Args) {
if (ai->isFake() && !emitFake)
@@ -2637,9 +2651,19 @@
OS << "}\n\n";
};
+ auto emitBothImplicitAndNonCreates = [&](bool DelayedArgsOnly,
+ bool emitFake, CreateKind Kind) {
+ emitCreate(true, DelayedArgsOnly, emitFake, Kind);
+ emitCreate(false, DelayedArgsOnly, emitFake, Kind);
+ };
+
auto emitCreates = [&](bool DelayedArgsOnly, bool emitFake) {
- emitCreate(true, DelayedArgsOnly, emitFake);
- emitCreate(false, DelayedArgsOnly, emitFake);
+ emitBothImplicitAndNonCreates(DelayedArgsOnly, emitFake,
+ CreateKind::WithNoArgs);
+ emitBothImplicitAndNonCreates(DelayedArgsOnly, emitFake,
+ CreateKind::WithAttributeCommonInfo);
+ emitBothImplicitAndNonCreates(DelayedArgsOnly, emitFake,
+ CreateKind::WithSourceRange);
emitCreateNoCI(true, DelayedArgsOnly, emitFake);
emitCreateNoCI(false, DelayedArgsOnly, emitFake);
};
Index: clang/lib/Sema/SemaDeclAttr.cpp
===================================================================
--- clang/lib/Sema/SemaDeclAttr.cpp
+++ clang/lib/Sema/SemaDeclAttr.cpp
@@ -2775,7 +2775,7 @@
return V;
};
AvailabilityAttr *NewAttr = S.mergeAvailabilityAttr(
- ND, AL.getRange(), NewII, true /*Implicit*/,
+ ND, AL, NewII, true /*Implicit*/,
MinMacCatalystVersion(Introduced.Version),
MinMacCatalystVersion(Deprecated.Version),
MinMacCatalystVersion(Obsoleted.Version), IsUnavailable, Str,
@@ -2817,7 +2817,7 @@
return V ? *V : VersionTuple();
};
AvailabilityAttr *NewAttr = S.mergeAvailabilityAttr(
- ND, AL.getRange(), NewII, true /*Implicit*/,
+ ND, AL, NewII, true /*Implicit*/,
VersionOrEmptyVersion(NewIntroduced),
VersionOrEmptyVersion(NewDeprecated),
VersionOrEmptyVersion(NewObsoleted), /*IsUnavailable=*/false, Str,
Index: clang/include/clang/Basic/AttributeCommonInfo.h
===================================================================
--- clang/include/clang/Basic/AttributeCommonInfo.h
+++ clang/include/clang/Basic/AttributeCommonInfo.h
@@ -76,11 +76,11 @@
static constexpr unsigned SpellingNotCalculated = 0xf;
public:
- AttributeCommonInfo(SourceRange AttrRange)
+ explicit AttributeCommonInfo(SourceRange AttrRange)
: AttrRange(AttrRange), ScopeLoc(), AttrKind(0), SyntaxUsed(0),
SpellingIndex(SpellingNotCalculated) {}
- AttributeCommonInfo(SourceLocation AttrLoc)
+ explicit AttributeCommonInfo(SourceLocation AttrLoc)
: AttrRange(AttrLoc), ScopeLoc(), AttrKind(0), SyntaxUsed(0),
SpellingIndex(SpellingNotCalculated) {}
Index: clang/include/clang/Basic/Attr.td
===================================================================
--- clang/include/clang/Basic/Attr.td
+++ clang/include/clang/Basic/Attr.td
@@ -834,7 +834,7 @@
return AnnotateAttr::Create(Ctx, Annotation, nullptr, 0, CommonInfo);
}
static AnnotateAttr *CreateImplicit(ASTContext &Ctx, llvm::StringRef Annotation, \
- const AttributeCommonInfo &CommonInfo = {SourceRange{}}) {
+ const AttributeCommonInfo &CommonInfo = AttributeCommonInfo{SourceRange{}}) {
return AnnotateAttr::CreateImplicit(Ctx, Annotation, nullptr, 0, CommonInfo);
}
}];
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
