Skip to content

Commit da2894b

Browse files
committed
[NFC] fix a dropUnusedArguments parameter name
(cherry picked from commit 6898e33)
1 parent bd83ae1 commit da2894b

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

include/swift/SILOptimizer/Utils/Generics.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ class ReabstractionInfo {
204204
ReabstractionInfo(ModuleDecl *targetModule, bool isModuleWholeModule,
205205
ApplySite Apply, SILFunction *Callee,
206206
SubstitutionMap ParamSubs, SerializedKind_t Serialized,
207-
bool ConvertIndirectToDirect, bool dropMetatypeArgs,
207+
bool ConvertIndirectToDirect, bool dropUnusedArguments,
208208
OptRemark::Emitter *ORE = nullptr);
209209

210210
/// Constructs the ReabstractionInfo for generic function \p Callee with

lib/SILOptimizer/IPO/CapturePropagation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ static SILFunction *getSpecializedWithDeadParams(
496496
FuncBuilder.getModule().getSwiftModule(),
497497
FuncBuilder.getModule().isWholeModule(), ApplySite(), Specialized,
498498
PAI->getSubstitutionMap(), Specialized->getSerializedKind(),
499-
/* ConvertIndirectToDirect */ false, /*dropMetatypeArgs=*/false);
499+
/* ConvertIndirectToDirect */ false, /*dropUnusedArguments=*/false);
500500
GenericFuncSpecializer FuncSpecializer(FuncBuilder,
501501
Specialized,
502502
ReInfo.getClonerParamSubstitutionMap(),

lib/SILOptimizer/IPO/UsePrespecialized.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ bool UsePrespecialized::replaceByPrespecialized(SILFunction &F) {
9696
ReabstractionInfo ReInfo(M.getSwiftModule(), M.isWholeModule(), AI,
9797
ReferencedF, Subs, IsNotSerialized,
9898
/*ConvertIndirectToDirect=*/ true,
99-
/*dropMetatypeArgs=*/ false);
99+
/*dropUnusedArguments=*/ false);
100100

101101
if (!ReInfo.canBeSpecialized())
102102
continue;

lib/SILOptimizer/Utils/Generics.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2916,7 +2916,8 @@ static bool createPrespecialized(StringRef UnspecializedName,
29162916
ReabstractionInfo ReInfo(M.getSwiftModule(), M.isWholeModule(), ApplySite(),
29172917
UnspecFunc, Apply.getSubstitutionMap(),
29182918
IsNotSerialized,
2919-
/*ConvertIndirectToDirect= */true, /*dropMetatypeArgs=*/ false);
2919+
/*ConvertIndirectToDirect= */true,
2920+
/*dropUnusedArguments=*/ false);
29202921

29212922
if (!ReInfo.canBeSpecialized())
29222923
return false;
@@ -3005,7 +3006,7 @@ static bool usePrespecialized(
30053006
funcBuilder.getModule().isWholeModule(), apply, refF,
30063007
apply.getSubstitutionMap(), IsNotSerialized,
30073008
/*ConvertIndirectToDirect=*/ true,
3008-
/*dropMetatypeArgs=*/ false);
3009+
/*dropUnusedArguments=*/ false);
30093010

30103011
for (auto *SA : refF->getSpecializeAttrs()) {
30113012
if (!SA->isExported())
@@ -3149,7 +3150,8 @@ static bool usePrespecialized(
31493150
funcBuilder.getModule().getSwiftModule(),
31503151
funcBuilder.getModule().isWholeModule(), apply, refF, newSubstMap,
31513152
apply.getFunction()->getSerializedKind(),
3152-
/*ConvertIndirectToDirect=*/ true, /*dropMetatypeArgs=*/ false, nullptr);
3153+
/*ConvertIndirectToDirect=*/ true,
3154+
/*dropUnusedArguments=*/ false, nullptr);
31533155

31543156
if (layoutReInfo.getSpecializedType() == reInfo.getSpecializedType()) {
31553157
layoutMatches.push_back(
@@ -3312,7 +3314,8 @@ void swift::trySpecializeApplyOfGeneric(
33123314
FuncBuilder.getModule().isWholeModule(), Apply, RefF,
33133315
Apply.getSubstitutionMap(), serializedKind,
33143316
/*ConvertIndirectToDirect=*/ true,
3315-
/*dropMetatypeArgs=*/ canDropMetatypeArgs(Apply, RefF),
3317+
/*dropUnusedArguments=*/
3318+
canDropMetatypeArgs(Apply, RefF),
33163319
&ORE);
33173320
if (!ReInfo.canBeSpecialized())
33183321
return;

lib/SILOptimizer/Utils/OptimizerBridging.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ OptionalBridgedFunction BridgedPassContext::specializeFunction(BridgedFunction f
206206
ReabstractionInfo ReInfo(mod->getSwiftModule(), mod->isWholeModule(),
207207
ApplySite(), origFunc, subs, IsNotSerialized,
208208
/*ConvertIndirectToDirect=*/true,
209-
/*dropMetatypeArgs=*/false);
209+
/*dropUnusedArguments=*/false);
210210

211211
if (!ReInfo.canBeSpecialized()) {
212212
return {nullptr};

0 commit comments

Comments
 (0)