Skip to content

Commit a8ead56

Browse files
authored
[clang][NFC] Rename ArgPassingKind to RecordArgPassingKind (llvm#70955)
During the recent refactoring (b120fe8) this enum was moved out of `RecordDecl`. During post-commit review it was found out that its association with `RecordDecl` should be expressed in the name.
1 parent 8912200 commit a8ead56

File tree

9 files changed

+28
-23
lines changed

9 files changed

+28
-23
lines changed

clang/include/clang/AST/Decl.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4063,7 +4063,7 @@ class EnumDecl : public TagDecl {
40634063
/// returned from function calls. This takes into account the target-specific
40644064
/// and version-specific rules along with the rules determined by the
40654065
/// language.
4066-
enum class ArgPassingKind {
4066+
enum class RecordArgPassingKind {
40674067
/// The argument of this type can be passed directly in registers.
40684068
CanPassInRegs,
40694069

@@ -4216,14 +4216,15 @@ class RecordDecl : public TagDecl {
42164216
/// it must have at least one trivial, non-deleted copy or move constructor.
42174217
/// FIXME: This should be set as part of completeDefinition.
42184218
bool canPassInRegisters() const {
4219-
return getArgPassingRestrictions() == ArgPassingKind::CanPassInRegs;
4219+
return getArgPassingRestrictions() == RecordArgPassingKind::CanPassInRegs;
42204220
}
42214221

4222-
ArgPassingKind getArgPassingRestrictions() const {
4223-
return static_cast<ArgPassingKind>(RecordDeclBits.ArgPassingRestrictions);
4222+
RecordArgPassingKind getArgPassingRestrictions() const {
4223+
return static_cast<RecordArgPassingKind>(
4224+
RecordDeclBits.ArgPassingRestrictions);
42244225
}
42254226

4226-
void setArgPassingRestrictions(ArgPassingKind Kind) {
4227+
void setArgPassingRestrictions(RecordArgPassingKind Kind) {
42274228
RecordDeclBits.ArgPassingRestrictions = llvm::to_underlying(Kind);
42284229
}
42294230

clang/include/clang/AST/DeclBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1399,7 +1399,7 @@ enum class DeductionCandidate : unsigned char {
13991399
Aggregate,
14001400
};
14011401

1402-
enum class ArgPassingKind;
1402+
enum class RecordArgPassingKind;
14031403
enum class OMPDeclareReductionInitKind;
14041404
enum class ObjCImplementationControl;
14051405
enum class LinkageSpecLanguageIDs;

clang/lib/AST/Decl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4932,7 +4932,7 @@ RecordDecl::RecordDecl(Kind DK, TagKind TK, const ASTContext &C,
49324932
setHasNonTrivialToPrimitiveDestructCUnion(false);
49334933
setHasNonTrivialToPrimitiveCopyCUnion(false);
49344934
setParamDestroyedInCallee(false);
4935-
setArgPassingRestrictions(ArgPassingKind::CanPassInRegs);
4935+
setArgPassingRestrictions(RecordArgPassingKind::CanPassInRegs);
49364936
setIsRandomized(false);
49374937
setODRHash(0);
49384938
}

clang/lib/AST/DeclCXX.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -446,8 +446,8 @@ CXXRecordDecl::setBases(CXXBaseSpecifier const * const *Bases,
446446
setHasVolatileMember(true);
447447

448448
if (BaseClassDecl->getArgPassingRestrictions() ==
449-
ArgPassingKind::CanNeverPassInRegs)
450-
setArgPassingRestrictions(ArgPassingKind::CanNeverPassInRegs);
449+
RecordArgPassingKind::CanNeverPassInRegs)
450+
setArgPassingRestrictions(RecordArgPassingKind::CanNeverPassInRegs);
451451

452452
// Keep track of the presence of mutable fields.
453453
if (BaseClassDecl->hasMutableFields())
@@ -1032,7 +1032,7 @@ void CXXRecordDecl::addedMember(Decl *D) {
10321032

10331033
// Structs with __weak fields should never be passed directly.
10341034
if (LT == Qualifiers::OCL_Weak)
1035-
setArgPassingRestrictions(ArgPassingKind::CanNeverPassInRegs);
1035+
setArgPassingRestrictions(RecordArgPassingKind::CanNeverPassInRegs);
10361036

10371037
Data.HasIrrelevantDestructor = false;
10381038

@@ -1226,8 +1226,8 @@ void CXXRecordDecl::addedMember(Decl *D) {
12261226
if (FieldRec->hasVolatileMember())
12271227
setHasVolatileMember(true);
12281228
if (FieldRec->getArgPassingRestrictions() ==
1229-
ArgPassingKind::CanNeverPassInRegs)
1230-
setArgPassingRestrictions(ArgPassingKind::CanNeverPassInRegs);
1229+
RecordArgPassingKind::CanNeverPassInRegs)
1230+
setArgPassingRestrictions(RecordArgPassingKind::CanNeverPassInRegs);
12311231

12321232
// C++0x [class]p7:
12331233
// A standard-layout class is a class that:

clang/lib/CodeGen/CGCall.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2719,7 +2719,8 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
27192719

27202720
auto *Decl = ParamType->getAsRecordDecl();
27212721
if (CodeGenOpts.PassByValueIsNoAlias && Decl &&
2722-
Decl->getArgPassingRestrictions() == ArgPassingKind::CanPassInRegs)
2722+
Decl->getArgPassingRestrictions() ==
2723+
RecordArgPassingKind::CanPassInRegs)
27232724
// When calling the function, the pointer passed in will be the only
27242725
// reference to the underlying object. Mark it accordingly.
27252726
Attrs.addAttribute(llvm::Attribute::NoAlias);

clang/lib/Sema/SemaDecl.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19196,10 +19196,12 @@ void Sema::ActOnFields(Scope *S, SourceLocation RecLoc, Decl *EnclosingDecl,
1919619196

1919719197
if (const auto *RT = FT->getAs<RecordType>()) {
1919819198
if (RT->getDecl()->getArgPassingRestrictions() ==
19199-
ArgPassingKind::CanNeverPassInRegs)
19200-
Record->setArgPassingRestrictions(ArgPassingKind::CanNeverPassInRegs);
19199+
RecordArgPassingKind::CanNeverPassInRegs)
19200+
Record->setArgPassingRestrictions(
19201+
RecordArgPassingKind::CanNeverPassInRegs);
1920119202
} else if (FT.getQualifiers().getObjCLifetime() == Qualifiers::OCL_Weak)
19202-
Record->setArgPassingRestrictions(ArgPassingKind::CanNeverPassInRegs);
19203+
Record->setArgPassingRestrictions(
19204+
RecordArgPassingKind::CanNeverPassInRegs);
1920319205
}
1920419206

1920519207
if (Record && FD->getType().isVolatileQualified())

clang/lib/Sema/SemaDeclCXX.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7281,10 +7281,11 @@ void Sema::CheckCompletedCXXClass(Scope *S, CXXRecordDecl *Record) {
72817281

72827282
// Do not change ArgPassingRestrictions if it has already been set to
72837283
// ArgPassingKind::CanNeverPassInRegs.
7284-
if (Record->getArgPassingRestrictions() != ArgPassingKind::CanNeverPassInRegs)
7285-
Record->setArgPassingRestrictions(CanPass
7286-
? ArgPassingKind::CanPassInRegs
7287-
: ArgPassingKind::CannotPassInRegs);
7284+
if (Record->getArgPassingRestrictions() !=
7285+
RecordArgPassingKind::CanNeverPassInRegs)
7286+
Record->setArgPassingRestrictions(
7287+
CanPass ? RecordArgPassingKind::CanPassInRegs
7288+
: RecordArgPassingKind::CannotPassInRegs);
72887289

72897290
// If canPassInRegisters returns true despite the record having a non-trivial
72907291
// destructor, the record is destructed in the callee. This happens only when

clang/lib/Serialization/ASTReaderDecl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -845,7 +845,7 @@ ASTDeclReader::VisitRecordDeclImpl(RecordDecl *RD) {
845845
RD->setHasNonTrivialToPrimitiveDestructCUnion(Record.readInt());
846846
RD->setHasNonTrivialToPrimitiveCopyCUnion(Record.readInt());
847847
RD->setParamDestroyedInCallee(Record.readInt());
848-
RD->setArgPassingRestrictions((ArgPassingKind)Record.readInt());
848+
RD->setArgPassingRestrictions((RecordArgPassingKind)Record.readInt());
849849
return Redecl;
850850
}
851851

@@ -4514,7 +4514,7 @@ void ASTDeclReader::UpdateDecl(Decl *D,
45144514
!Reader.PendingFakeDefinitionData.count(OldDD));
45154515
RD->setParamDestroyedInCallee(Record.readInt());
45164516
RD->setArgPassingRestrictions(
4517-
static_cast<ArgPassingKind>(Record.readInt()));
4517+
static_cast<RecordArgPassingKind>(Record.readInt()));
45184518
ReadCXXRecordDefinition(RD, /*Update*/true);
45194519

45204520
// Visible update is handled separately.

lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1929,7 +1929,7 @@ DWARFASTParserClang::ParseStructureLikeDIE(const SymbolContext &sc,
19291929
m_ast.GetAsCXXRecordDecl(clang_type.GetOpaqueQualType());
19301930
if (record_decl)
19311931
record_decl->setArgPassingRestrictions(
1932-
clang::ArgPassingKind::CannotPassInRegs);
1932+
clang::RecordArgPassingKind::CannotPassInRegs);
19331933
}
19341934
return type_sp;
19351935
}

0 commit comments

Comments
 (0)