Skip to content

Commit 2c8b297

Browse files
tahonermanntahonermann
committed
Address code review feedback from Erich Keane.
- Removed "Small" from the names of the new type aliases.
1 parent f413b7e commit 2c8b297

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

‎clang/lib/CodeGen/CGCall.cpp‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ static void appendParameterTypes(const CodeGenTypes &CGT,
199199
prefix.size());
200200
}
201201

202-
using SmallExtParameterInfoList =
202+
using ExtParameterInfoList =
203203
SmallVector<FunctionProtoType::ExtParameterInfo, 16>;
204204

205205
/// Arrange the LLVM function layout for a value of the given function
@@ -208,7 +208,7 @@ static const CGFunctionInfo &
208208
arrangeLLVMFunctionInfo(CodeGenTypes &CGT, bool instanceMethod,
209209
SmallVectorImpl<CanQualType> &prefix,
210210
CanQual<FunctionProtoType> FTP) {
211-
SmallExtParameterInfoList paramInfos;
211+
ExtParameterInfoList paramInfos;
212212
RequiredArgs Required = RequiredArgs::forPrototypePlus(FTP, prefix.size());
213213
appendParameterTypes(CGT, prefix, paramInfos, FTP);
214214
CanQualType resultType = FTP->getReturnType().getUnqualifiedType();
@@ -219,13 +219,13 @@ arrangeLLVMFunctionInfo(CodeGenTypes &CGT, bool instanceMethod,
219219
FTP->getExtInfo(), paramInfos, Required);
220220
}
221221

222-
using SmallCanQualTypeList = SmallVector<CanQualType, 16>;
222+
using CanQualTypeList = SmallVector<CanQualType, 16>;
223223

224224
/// Arrange the argument and result information for a value of the
225225
/// given freestanding function type.
226226
const CGFunctionInfo &
227227
CodeGenTypes::arrangeFreeFunctionType(CanQual<FunctionProtoType> FTP) {
228-
SmallCanQualTypeList argTypes;
228+
CanQualTypeList argTypes;
229229
return ::arrangeLLVMFunctionInfo(*this, /*instanceMethod=*/false, argTypes,
230230
FTP);
231231
}
@@ -323,7 +323,7 @@ const CGFunctionInfo &
323323
CodeGenTypes::arrangeCXXMethodType(const CXXRecordDecl *RD,
324324
const FunctionProtoType *FTP,
325325
const CXXMethodDecl *MD) {
326-
SmallCanQualTypeList argTypes;
326+
CanQualTypeList argTypes;
327327

328328
// Add the 'this' pointer.
329329
argTypes.push_back(DeriveThisType(RD, MD));
@@ -379,8 +379,8 @@ const CGFunctionInfo &
379379
CodeGenTypes::arrangeCXXStructorDeclaration(GlobalDecl GD) {
380380
auto *MD = cast<CXXMethodDecl>(GD.getDecl());
381381

382-
SmallCanQualTypeList argTypes;
383-
SmallExtParameterInfoList paramInfos;
382+
CanQualTypeList argTypes;
383+
ExtParameterInfoList paramInfos;
384384

385385
const CXXRecordDecl *ThisType = getCXXABI().getThisArgumentTypeForMethod(GD);
386386
argTypes.push_back(DeriveThisType(ThisType, MD));
@@ -425,26 +425,26 @@ CodeGenTypes::arrangeCXXStructorDeclaration(GlobalDecl GD) {
425425
argTypes, extInfo, paramInfos, required);
426426
}
427427

428-
static SmallCanQualTypeList getArgTypesForCall(ASTContext &ctx,
429-
const CallArgList &args) {
430-
SmallCanQualTypeList argTypes;
428+
static CanQualTypeList getArgTypesForCall(ASTContext &ctx,
429+
const CallArgList &args) {
430+
CanQualTypeList argTypes;
431431
for (auto &arg : args)
432432
argTypes.push_back(ctx.getCanonicalParamType(arg.Ty));
433433
return argTypes;
434434
}
435435

436-
static SmallCanQualTypeList
437-
getArgTypesForDeclaration(ASTContext &ctx, const FunctionArgList &args) {
438-
SmallCanQualTypeList argTypes;
436+
static CanQualTypeList getArgTypesForDeclaration(ASTContext &ctx,
437+
const FunctionArgList &args) {
438+
CanQualTypeList argTypes;
439439
for (auto &arg : args)
440440
argTypes.push_back(ctx.getCanonicalParamType(arg->getType()));
441441
return argTypes;
442442
}
443443

444-
static SmallExtParameterInfoList
444+
static ExtParameterInfoList
445445
getExtParameterInfosForCall(const FunctionProtoType *proto, unsigned prefixArgs,
446446
unsigned totalArgs) {
447-
SmallExtParameterInfoList result;
447+
ExtParameterInfoList result;
448448
if (proto->hasExtParameterInfos()) {
449449
addExtParameterInfosForCall(result, proto, prefixArgs, totalArgs);
450450
}
@@ -466,7 +466,7 @@ CodeGenTypes::arrangeCXXConstructorCall(const CallArgList &args,
466466
unsigned ExtraPrefixArgs,
467467
unsigned ExtraSuffixArgs,
468468
bool PassProtoArgs) {
469-
SmallCanQualTypeList ArgTypes;
469+
CanQualTypeList ArgTypes;
470470
for (const auto &Arg : args)
471471
ArgTypes.push_back(Context.getCanonicalParamType(Arg.Ty));
472472

@@ -486,7 +486,7 @@ CodeGenTypes::arrangeCXXConstructorCall(const CallArgList &args,
486486
: Context.VoidTy;
487487

488488
FunctionType::ExtInfo Info = FPT->getExtInfo();
489-
SmallExtParameterInfoList ParamInfos;
489+
ExtParameterInfoList ParamInfos;
490490
// If the prototype args are elided, we should only have ABI-specific args,
491491
// which never have param info.
492492
if (PassProtoArgs && FPT->hasExtParameterInfos()) {
@@ -549,8 +549,8 @@ CodeGenTypes::arrangeObjCMethodDeclaration(const ObjCMethodDecl *MD) {
549549
const CGFunctionInfo &
550550
CodeGenTypes::arrangeObjCMessageSendSignature(const ObjCMethodDecl *MD,
551551
QualType receiverType) {
552-
SmallCanQualTypeList argTys;
553-
SmallExtParameterInfoList extParamInfos(MD->isDirectMethod() ? 1 : 2);
552+
CanQualTypeList argTys;
553+
ExtParameterInfoList extParamInfos(MD->isDirectMethod() ? 1 : 2);
554554
argTys.push_back(Context.getCanonicalParamType(receiverType));
555555
if (!MD->isDirectMethod())
556556
argTys.push_back(Context.getCanonicalParamType(Context.getObjCSelType()));
@@ -580,7 +580,7 @@ CodeGenTypes::arrangeObjCMessageSendSignature(const ObjCMethodDecl *MD,
580580
const CGFunctionInfo &
581581
CodeGenTypes::arrangeUnprototypedObjCMessageSend(QualType returnType,
582582
const CallArgList &args) {
583-
SmallCanQualTypeList argTypes = getArgTypesForCall(Context, args);
583+
CanQualTypeList argTypes = getArgTypesForCall(Context, args);
584584
FunctionType::ExtInfo einfo;
585585

586586
return arrangeLLVMFunctionInfo(GetReturnType(returnType), FnInfoOpts::None,
@@ -642,7 +642,7 @@ arrangeFreeFunctionLikeCall(CodeGenTypes &CGT,
642642
bool chainCall) {
643643
assert(args.size() >= numExtraRequiredArgs);
644644

645-
SmallExtParameterInfoList paramInfos;
645+
ExtParameterInfoList paramInfos;
646646

647647
// In most cases, there are no optional arguments.
648648
RequiredArgs required = RequiredArgs::All;
@@ -667,7 +667,7 @@ arrangeFreeFunctionLikeCall(CodeGenTypes &CGT,
667667
required = RequiredArgs(args.size());
668668
}
669669

670-
SmallCanQualTypeList argTypes;
670+
CanQualTypeList argTypes;
671671
for (const auto &arg : args)
672672
argTypes.push_back(CGT.getContext().getCanonicalParamType(arg.Ty));
673673
FnInfoOpts opts = chainCall ? FnInfoOpts::IsChainCall : FnInfoOpts::None;
@@ -700,9 +700,9 @@ CodeGenTypes::arrangeBlockFunctionCall(const CallArgList &args,
700700
const CGFunctionInfo &
701701
CodeGenTypes::arrangeBlockFunctionDeclaration(const FunctionProtoType *proto,
702702
const FunctionArgList &params) {
703-
SmallExtParameterInfoList paramInfos =
703+
ExtParameterInfoList paramInfos =
704704
getExtParameterInfosForCall(proto, 1, params.size());
705-
SmallCanQualTypeList argTypes = getArgTypesForDeclaration(Context, params);
705+
CanQualTypeList argTypes = getArgTypesForDeclaration(Context, params);
706706

707707
return arrangeLLVMFunctionInfo(GetReturnType(proto->getReturnType()),
708708
FnInfoOpts::None, argTypes,
@@ -713,7 +713,7 @@ CodeGenTypes::arrangeBlockFunctionDeclaration(const FunctionProtoType *proto,
713713
const CGFunctionInfo &
714714
CodeGenTypes::arrangeBuiltinFunctionCall(QualType resultType,
715715
const CallArgList &args) {
716-
SmallCanQualTypeList argTypes;
716+
CanQualTypeList argTypes;
717717
for (const auto &Arg : args)
718718
argTypes.push_back(Context.getCanonicalParamType(Arg.Ty));
719719
return arrangeLLVMFunctionInfo(GetReturnType(resultType), FnInfoOpts::None,
@@ -724,7 +724,7 @@ CodeGenTypes::arrangeBuiltinFunctionCall(QualType resultType,
724724
const CGFunctionInfo &
725725
CodeGenTypes::arrangeBuiltinFunctionDeclaration(QualType resultType,
726726
const FunctionArgList &args) {
727-
SmallCanQualTypeList argTypes = getArgTypesForDeclaration(Context, args);
727+
CanQualTypeList argTypes = getArgTypesForDeclaration(Context, args);
728728

729729
return arrangeLLVMFunctionInfo(GetReturnType(resultType), FnInfoOpts::None,
730730
argTypes, FunctionType::ExtInfo(), {},
@@ -752,10 +752,10 @@ CodeGenTypes::arrangeCXXMethodCall(const CallArgList &args,
752752
"Emitting a call with less args than the required prefix?");
753753
// Add one to account for `this`. It's a bit awkward here, but we don't count
754754
// `this` in similar places elsewhere.
755-
SmallExtParameterInfoList paramInfos =
755+
ExtParameterInfoList paramInfos =
756756
getExtParameterInfosForCall(proto, numPrefixArgs + 1, args.size());
757757

758-
SmallCanQualTypeList argTypes = getArgTypesForCall(Context, args);
758+
CanQualTypeList argTypes = getArgTypesForCall(Context, args);
759759

760760
FunctionType::ExtInfo info = proto->getExtInfo();
761761
return arrangeLLVMFunctionInfo(GetReturnType(proto->getReturnType()),
@@ -776,14 +776,14 @@ CodeGenTypes::arrangeCall(const CGFunctionInfo &signature,
776776
if (signature.arg_size() == args.size())
777777
return signature;
778778

779-
SmallExtParameterInfoList paramInfos;
779+
ExtParameterInfoList paramInfos;
780780
auto sigParamInfos = signature.getExtParameterInfos();
781781
if (!sigParamInfos.empty()) {
782782
paramInfos.append(sigParamInfos.begin(), sigParamInfos.end());
783783
paramInfos.resize(args.size());
784784
}
785785

786-
SmallCanQualTypeList argTypes = getArgTypesForCall(Context, args);
786+
CanQualTypeList argTypes = getArgTypesForCall(Context, args);
787787

788788
assert(signature.getRequiredArgs().allowsOptionalArgs());
789789
FnInfoOpts opts = FnInfoOpts::None;

0 commit comments

Comments
 (0)