Skip to content

Commit dda8e3d

Browse files
EndilllEndilll
committed
[clang][NFC] Refactor ImplicitParamDecl::ImplicitParamKind
This patch converts `ImplicitParamDecl::ImplicitParamKind` into a scoped enum at namespace scope, making it eligible for forward declaring. This is useful for `preferred_type` annotations on bit-fields.
1 parent 3f69b0a commit dda8e3d

22 files changed

+128
-128
lines changed

‎clang/include/clang/AST/Decl.h‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1654,36 +1654,36 @@ class VarDecl : public DeclaratorDecl, public Redeclarable<VarDecl> {
16541654
static bool classofKind(Kind K) { return K >= firstVar && K <= lastVar; }
16551655
};
16561656

1657-
class ImplicitParamDecl : public VarDecl {
1658-
void anchor() override;
1657+
/// Defines the kind of the implicit parameter: is this an implicit parameter
1658+
/// with pointer to 'this', 'self', '_cmd', virtual table pointers, captured
1659+
/// context or something else.
1660+
enum class ImplicitParamKind {
1661+
/// Parameter for Objective-C 'self' argument
1662+
ObjCSelf,
16591663

1660-
public:
1661-
/// Defines the kind of the implicit parameter: is this an implicit parameter
1662-
/// with pointer to 'this', 'self', '_cmd', virtual table pointers, captured
1663-
/// context or something else.
1664-
enum ImplicitParamKind : unsigned {
1665-
/// Parameter for Objective-C 'self' argument
1666-
ObjCSelf,
1664+
/// Parameter for Objective-C '_cmd' argument
1665+
ObjCCmd,
16671666

1668-
/// Parameter for Objective-C '_cmd' argument
1669-
ObjCCmd,
1667+
/// Parameter for C++ 'this' argument
1668+
CXXThis,
16701669

1671-
/// Parameter for C++ 'this' argument
1672-
CXXThis,
1670+
/// Parameter for C++ virtual table pointers
1671+
CXXVTT,
16731672

1674-
/// Parameter for C++ virtual table pointers
1675-
CXXVTT,
1673+
/// Parameter for captured context
1674+
CapturedContext,
16761675

1677-
/// Parameter for captured context
1678-
CapturedContext,
1676+
/// Parameter for Thread private variable
1677+
ThreadPrivateVar,
16791678

1680-
/// Parameter for Thread private variable
1681-
ThreadPrivateVar,
1679+
/// Other implicit parameter
1680+
Other,
1681+
};
16821682

1683-
/// Other implicit parameter
1684-
Other,
1685-
};
1683+
class ImplicitParamDecl : public VarDecl {
1684+
void anchor() override;
16861685

1686+
public:
16871687
/// Create implicit parameter.
16881688
static ImplicitParamDecl *Create(ASTContext &C, DeclContext *DC,
16891689
SourceLocation IdLoc, IdentifierInfo *Id,
@@ -1698,15 +1698,15 @@ class ImplicitParamDecl : public VarDecl {
16981698
ImplicitParamKind ParamKind)
16991699
: VarDecl(ImplicitParam, C, DC, IdLoc, IdLoc, Id, Type,
17001700
/*TInfo=*/nullptr, SC_None) {
1701-
NonParmVarDeclBits.ImplicitParamKind = ParamKind;
1701+
NonParmVarDeclBits.ImplicitParamKind = llvm::to_underlying(ParamKind);
17021702
setImplicit();
17031703
}
17041704

17051705
ImplicitParamDecl(ASTContext &C, QualType Type, ImplicitParamKind ParamKind)
17061706
: VarDecl(ImplicitParam, C, /*DC=*/nullptr, SourceLocation(),
17071707
SourceLocation(), /*Id=*/nullptr, Type,
17081708
/*TInfo=*/nullptr, SC_None) {
1709-
NonParmVarDeclBits.ImplicitParamKind = ParamKind;
1709+
NonParmVarDeclBits.ImplicitParamKind = llvm::to_underlying(ParamKind);
17101710
setImplicit();
17111711
}
17121712

‎clang/lib/AST/DeclObjC.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,7 @@ void ObjCMethodDecl::createImplicitParams(ASTContext &Context,
11941194
getSelfType(Context, OID, selfIsPseudoStrong, selfIsConsumed);
11951195
auto *Self = ImplicitParamDecl::Create(Context, this, SourceLocation(),
11961196
&Context.Idents.get("self"), selfTy,
1197-
ImplicitParamDecl::ObjCSelf);
1197+
ImplicitParamKind::ObjCSelf);
11981198
setSelfDecl(Self);
11991199

12001200
if (selfIsConsumed)
@@ -1205,7 +1205,7 @@ void ObjCMethodDecl::createImplicitParams(ASTContext &Context,
12051205

12061206
setCmdDecl(ImplicitParamDecl::Create(
12071207
Context, this, SourceLocation(), &Context.Idents.get("_cmd"),
1208-
Context.getObjCSelType(), ImplicitParamDecl::ObjCCmd));
1208+
Context.getObjCSelType(), ImplicitParamKind::ObjCCmd));
12091209
}
12101210

12111211
ObjCInterfaceDecl *ObjCMethodDecl::getClassInterface() {

‎clang/lib/AST/ODRHash.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,12 +385,12 @@ class ODRDeclVisitor : public ConstDeclVisitor<ODRDeclVisitor> {
385385
ImplicitParamDecl *Cmd = Method->getCmdDecl();
386386
Hash.AddBoolean(Cmd);
387387
if (Cmd)
388-
ID.AddInteger(Cmd->getParameterKind());
388+
ID.AddInteger(llvm::to_underlying(Cmd->getParameterKind()));
389389

390390
ImplicitParamDecl *Self = Method->getSelfDecl();
391391
Hash.AddBoolean(Self);
392392
if (Self)
393-
ID.AddInteger(Self->getParameterKind());
393+
ID.AddInteger(llvm::to_underlying(Self->getParameterKind()));
394394

395395
AddDecl(Method);
396396

‎clang/lib/AST/StmtPrinter.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,7 @@ void StmtPrinter::VisitUnresolvedLookupExpr(UnresolvedLookupExpr *Node) {
12011201
static bool isImplicitSelf(const Expr *E) {
12021202
if (const auto *DRE = dyn_cast<DeclRefExpr>(E)) {
12031203
if (const auto *PD = dyn_cast<ImplicitParamDecl>(DRE->getDecl())) {
1204-
if (PD->getParameterKind() == ImplicitParamDecl::ObjCSelf &&
1204+
if (PD->getParameterKind() == ImplicitParamKind::ObjCSelf &&
12051205
DRE->getBeginLoc().isInvalid())
12061206
return true;
12071207
}

‎clang/lib/CodeGen/CGBlocks.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,7 @@ llvm::Value *CodeGenFunction::EmitBlockLiteral(const CGBlockInfo &blockInfo) {
992992
// Fake up a new variable so that EmitScalarInit doesn't think
993993
// we're referring to the variable in its own initializer.
994994
ImplicitParamDecl BlockFieldPseudoVar(getContext(), type,
995-
ImplicitParamDecl::Other);
995+
ImplicitParamKind::Other);
996996

997997
// We use one of these or the other depending on whether the
998998
// reference is nested.
@@ -1450,7 +1450,7 @@ llvm::Function *CodeGenFunction::GenerateBlockFunction(
14501450

14511451
ImplicitParamDecl SelfDecl(getContext(), const_cast<BlockDecl *>(blockDecl),
14521452
SourceLocation(), II, selfTy,
1453-
ImplicitParamDecl::ObjCSelf);
1453+
ImplicitParamKind::ObjCSelf);
14541454
args.push_back(&SelfDecl);
14551455

14561456
// Now add the rest of the parameters.
@@ -1874,9 +1874,9 @@ CodeGenFunction::GenerateCopyHelperFunction(const CGBlockInfo &blockInfo) {
18741874
QualType ReturnTy = C.VoidTy;
18751875

18761876
FunctionArgList args;
1877-
ImplicitParamDecl DstDecl(C, C.VoidPtrTy, ImplicitParamDecl::Other);
1877+
ImplicitParamDecl DstDecl(C, C.VoidPtrTy, ImplicitParamKind::Other);
18781878
args.push_back(&DstDecl);
1879-
ImplicitParamDecl SrcDecl(C, C.VoidPtrTy, ImplicitParamDecl::Other);
1879+
ImplicitParamDecl SrcDecl(C, C.VoidPtrTy, ImplicitParamKind::Other);
18801880
args.push_back(&SrcDecl);
18811881

18821882
const CGFunctionInfo &FI =
@@ -2061,7 +2061,7 @@ CodeGenFunction::GenerateDestroyHelperFunction(const CGBlockInfo &blockInfo) {
20612061
QualType ReturnTy = C.VoidTy;
20622062

20632063
FunctionArgList args;
2064-
ImplicitParamDecl SrcDecl(C, C.VoidPtrTy, ImplicitParamDecl::Other);
2064+
ImplicitParamDecl SrcDecl(C, C.VoidPtrTy, ImplicitParamKind::Other);
20652065
args.push_back(&SrcDecl);
20662066

20672067
const CGFunctionInfo &FI =
@@ -2303,10 +2303,10 @@ generateByrefCopyHelper(CodeGenFunction &CGF, const BlockByrefInfo &byrefInfo,
23032303
QualType ReturnTy = Context.VoidTy;
23042304

23052305
FunctionArgList args;
2306-
ImplicitParamDecl Dst(Context, Context.VoidPtrTy, ImplicitParamDecl::Other);
2306+
ImplicitParamDecl Dst(Context, Context.VoidPtrTy, ImplicitParamKind::Other);
23072307
args.push_back(&Dst);
23082308

2309-
ImplicitParamDecl Src(Context, Context.VoidPtrTy, ImplicitParamDecl::Other);
2309+
ImplicitParamDecl Src(Context, Context.VoidPtrTy, ImplicitParamKind::Other);
23102310
args.push_back(&Src);
23112311

23122312
const CGFunctionInfo &FI =
@@ -2371,7 +2371,7 @@ generateByrefDisposeHelper(CodeGenFunction &CGF,
23712371

23722372
FunctionArgList args;
23732373
ImplicitParamDecl Src(CGF.getContext(), Context.VoidPtrTy,
2374-
ImplicitParamDecl::Other);
2374+
ImplicitParamKind::Other);
23752375
args.push_back(&Src);
23762376

23772377
const CGFunctionInfo &FI =

‎clang/lib/CodeGen/CGBuiltin.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1893,7 +1893,7 @@ llvm::Function *CodeGenFunction::generateBuiltinOSLogHelperFunction(
18931893
FunctionArgList Args;
18941894
Args.push_back(ImplicitParamDecl::Create(
18951895
Ctx, nullptr, SourceLocation(), &Ctx.Idents.get("buffer"), Ctx.VoidPtrTy,
1896-
ImplicitParamDecl::Other));
1896+
ImplicitParamKind::Other));
18971897
ArgTys.emplace_back(Ctx.VoidPtrTy);
18981898

18991899
for (unsigned int I = 0, E = Layout.Items.size(); I < E; ++I) {
@@ -1905,7 +1905,7 @@ llvm::Function *CodeGenFunction::generateBuiltinOSLogHelperFunction(
19051905
Args.push_back(ImplicitParamDecl::Create(
19061906
Ctx, nullptr, SourceLocation(),
19071907
&Ctx.Idents.get(std::string("arg") + llvm::to_string(I)), ArgTy,
1908-
ImplicitParamDecl::Other));
1908+
ImplicitParamKind::Other));
19091909
ArgTys.emplace_back(ArgTy);
19101910
}
19111911

‎clang/lib/CodeGen/CGCXXABI.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ void CGCXXABI::buildThisParam(CodeGenFunction &CGF, FunctionArgList &params) {
120120

121121
// FIXME: I'm not entirely sure I like using a fake decl just for code
122122
// generation. Maybe we can come up with a better way?
123-
auto *ThisDecl = ImplicitParamDecl::Create(
124-
CGM.getContext(), nullptr, MD->getLocation(),
125-
&CGM.getContext().Idents.get("this"), MD->getThisType(),
126-
ImplicitParamDecl::CXXThis);
123+
auto *ThisDecl =
124+
ImplicitParamDecl::Create(CGM.getContext(), nullptr, MD->getLocation(),
125+
&CGM.getContext().Idents.get("this"),
126+
MD->getThisType(), ImplicitParamKind::CXXThis);
127127
params.push_back(ThisDecl);
128128
CGF.CXXABIThisDecl = ThisDecl;
129129

‎clang/lib/CodeGen/CGDebugInfo.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4619,8 +4619,8 @@ llvm::DILocalVariable *CGDebugInfo::EmitDeclare(const VarDecl *VD,
46194619
// If this is implicit parameter of CXXThis or ObjCSelf kind, then give it an
46204620
// object pointer flag.
46214621
if (const auto *IPD = dyn_cast<ImplicitParamDecl>(VD)) {
4622-
if (IPD->getParameterKind() == ImplicitParamDecl::CXXThis ||
4623-
IPD->getParameterKind() == ImplicitParamDecl::ObjCSelf)
4622+
if (IPD->getParameterKind() == ImplicitParamKind::CXXThis ||
4623+
IPD->getParameterKind() == ImplicitParamKind::ObjCSelf)
46244624
Flags |= llvm::DINode::FlagObjectPointer;
46254625
}
46264626

@@ -4953,7 +4953,7 @@ void CGDebugInfo::EmitDeclareOfBlockDeclRefVariable(
49534953
// Self is passed along as an implicit non-arg variable in a
49544954
// block. Mark it as the object pointer.
49554955
if (const auto *IPD = dyn_cast<ImplicitParamDecl>(VD))
4956-
if (IPD->getParameterKind() == ImplicitParamDecl::ObjCSelf)
4956+
if (IPD->getParameterKind() == ImplicitParamKind::ObjCSelf)
49574957
Ty = CreateSelfType(VD->getType(), Ty);
49584958

49594959
// Get location information.

‎clang/lib/CodeGen/CGDecl.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2518,7 +2518,7 @@ void CodeGenFunction::EmitParmDecl(const VarDecl &D, ParamValue Arg,
25182518
// Suppressing debug info for ThreadPrivateVar parameters, else it hides
25192519
// debug info of TLS variables.
25202520
NoDebugInfo =
2521-
(IPD->getParameterKind() == ImplicitParamDecl::ThreadPrivateVar);
2521+
(IPD->getParameterKind() == ImplicitParamKind::ThreadPrivateVar);
25222522
}
25232523

25242524
Address DeclPtr = Address::invalid();

‎clang/lib/CodeGen/CGDeclCXX.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ llvm::Function *CodeGenFunction::createTLSAtExitStub(
292292

293293
FunctionArgList Args;
294294
ImplicitParamDecl IPD(CGM.getContext(), CGM.getContext().IntTy,
295-
ImplicitParamDecl::Other);
295+
ImplicitParamKind::Other);
296296
Args.push_back(&IPD);
297297
QualType ResTy = CGM.getContext().IntTy;
298298

@@ -1138,7 +1138,7 @@ llvm::Function *CodeGenFunction::generateDestroyHelper(
11381138
bool useEHCleanupForArray, const VarDecl *VD) {
11391139
FunctionArgList args;
11401140
ImplicitParamDecl Dst(getContext(), getContext().VoidPtrTy,
1141-
ImplicitParamDecl::Other);
1141+
ImplicitParamKind::Other);
11421142
args.push_back(&Dst);
11431143

11441144
const CGFunctionInfo &FI =

0 commit comments

Comments
 (0)