Skip to content

Commit d492a53

Browse files
committed
GSB: Remove unused SourceLoc parameter from computeGenericSignature()
1 parent 04f9fcb commit d492a53

File tree

6 files changed

+12
-23
lines changed

6 files changed

+12
-23
lines changed

include/swift/AST/GenericSignatureBuilder.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,6 @@ class GenericSignatureBuilder {
626626
/// After this point, one cannot introduce new requirements, and the
627627
/// generic signature builder no longer has valid state.
628628
GenericSignature computeGenericSignature(
629-
SourceLoc loc,
630629
bool allowConcreteGenericParams = false,
631630
bool allowBuilderToMove = true) &&;
632631

@@ -639,8 +638,7 @@ class GenericSignatureBuilder {
639638
///
640639
/// \param allowConcreteGenericParams If true, allow generic parameters to
641640
/// be made concrete.
642-
void finalize(SourceLoc loc,
643-
TypeArrayView<GenericTypeParamType> genericParams,
641+
void finalize(TypeArrayView<GenericTypeParamType> genericParams,
644642
bool allowConcreteGenericParams=false);
645643

646644
public:

lib/AST/ASTContext.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,8 +1742,7 @@ GenericSignatureBuilder *ASTContext::getOrCreateGenericSignatureBuilder(
17421742

17431743
#if SWIFT_GSB_EXPENSIVE_ASSERTIONS
17441744
auto builderSig =
1745-
builder->computeGenericSignature(SourceLoc(),
1746-
/*allowConcreteGenericParams=*/true);
1745+
builder->computeGenericSignature(/*allowConcreteGenericParams=*/true);
17471746
if (builderSig.getCanonicalSignature() != sig) {
17481747
llvm::errs() << "ERROR: generic signature builder is not idempotent.\n";
17491748
llvm::errs() << "Original generic signature : ";

lib/AST/GenericSignatureBuilder.cpp

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5302,9 +5302,8 @@ static void expandSameTypeConstraints(GenericSignatureBuilder &builder,
53025302
}
53035303

53045304
void
5305-
GenericSignatureBuilder::finalize(SourceLoc loc,
5306-
TypeArrayView<GenericTypeParamType> genericParams,
5307-
bool allowConcreteGenericParams) {
5305+
GenericSignatureBuilder::finalize(TypeArrayView<GenericTypeParamType> genericParams,
5306+
bool allowConcreteGenericParams) {
53085307
// Process any delayed requirements that we can handle now.
53095308
processDelayedRequirements();
53105309

@@ -7188,11 +7187,10 @@ static void collectRequirements(GenericSignatureBuilder &builder,
71887187
}
71897188

71907189
GenericSignature GenericSignatureBuilder::computeGenericSignature(
7191-
SourceLoc loc,
71927190
bool allowConcreteGenericParams,
71937191
bool allowBuilderToMove) && {
71947192
// Finalize the builder, producing any necessary diagnostics.
7195-
finalize(loc, getGenericParams(), allowConcreteGenericParams);
7193+
finalize(getGenericParams(), allowConcreteGenericParams);
71967194

71977195
// Collect the requirements placed on the generic parameter types.
71987196
SmallVector<Requirement, 4> requirements;
@@ -7258,9 +7256,7 @@ void GenericSignatureBuilder::verifyGenericSignature(ASTContext &context,
72587256
// Form a generic signature from the result.
72597257
auto newSig =
72607258
std::move(builder).computeGenericSignature(
7261-
SourceLoc(),
7262-
/*allowConcreteGenericParams=*/true,
7263-
/*allowBuilderToMove=*/true);
7259+
/*allowConcreteGenericParams=*/true);
72647260

72657261
// The new signature should be equal.
72667262
if (!newSig->isEqual(sig)) {
@@ -7294,9 +7290,7 @@ void GenericSignatureBuilder::verifyGenericSignature(ASTContext &context,
72947290
// Form a generic signature from the result.
72957291
auto newSig =
72967292
std::move(builder).computeGenericSignature(
7297-
SourceLoc(),
7298-
/*allowConcreteGenericParams=*/true,
7299-
/*allowBuilderToMove=*/true);
7293+
/*allowConcreteGenericParams=*/true);
73007294

73017295
// If the removed requirement is satisfied by the new generic signature,
73027296
// it is redundant. Complain.
@@ -7474,7 +7468,7 @@ AbstractGenericSignatureRequest::evaluate(
74747468
builder.addRequirement(req, source, nullptr);
74757469

74767470
return std::move(builder).computeGenericSignature(
7477-
SourceLoc(), /*allowConcreteGenericParams=*/true);
7471+
/*allowConcreteGenericParams=*/true);
74787472
}
74797473

74807474
GenericSignature
@@ -7605,5 +7599,5 @@ InferredGenericSignatureRequest::evaluate(
76057599
builder.addRequirement(req, source, parentModule);
76067600

76077601
return std::move(builder).computeGenericSignature(
7608-
SourceLoc(), allowConcreteGenericParams);
7602+
allowConcreteGenericParams);
76097603
}

lib/SILOptimizer/Differentiation/Thunk.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ CanGenericSignature buildThunkSignature(SILFunction *fn, bool inheritGenericSig,
7676
builder.addRequirement(newRequirement, source, nullptr);
7777

7878
auto genericSig = std::move(builder).computeGenericSignature(
79-
SourceLoc(), /*allowConcreteGenericParams=*/true);
79+
/*allowConcreteGenericParams=*/true);
8080
genericEnv = genericSig->getGenericEnvironment();
8181

8282
newArchetype =

lib/Sema/TypeCheckAttr.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2270,7 +2270,6 @@ void AttributeChecker::visitSpecializeAttr(SpecializeAttr *attr) {
22702270

22712271
// Check the result.
22722272
auto specializedSig = std::move(Builder).computeGenericSignature(
2273-
attr->getLocation(),
22742273
/*allowConcreteGenericParams=*/true);
22752274
attr->setSpecializedSignature(specializedSig);
22762275

@@ -4329,7 +4328,7 @@ bool resolveDifferentiableAttrDerivativeGenericSignature(
43294328

43304329
// Compute generic signature for derivative functions.
43314330
derivativeGenSig = std::move(builder).computeGenericSignature(
4332-
attr->getLocation(), /*allowConcreteGenericParams=*/true);
4331+
/*allowConcreteGenericParams=*/true);
43334332
}
43344333

43354334
attr->setDerivativeGenericSignature(derivativeGenSig);

lib/Sema/TypeCheckDecl.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -938,8 +938,7 @@ RequirementSignatureRequest::evaluate(Evaluator &evaluator,
938938
nullptr);
939939

940940
auto reqSignature = std::move(builder).computeGenericSignature(
941-
SourceLoc(),
942-
/*allowConcreteGenericPArams=*/false,
941+
/*allowConcreteGenericParams=*/false,
943942
/*allowBuilderToMove=*/false);
944943
return reqSignature->getRequirements();
945944
}

0 commit comments

Comments
 (0)