[NFC] Use GenericSIgnature::getGanonicalSignature Where Possible

CodaFi · CodaFi · commit a0615e984818 · 2021-07-22T23:27:06.000-07:00
diff --git a/include/swift/AST/AutoDiff.h b/include/swift/AST/AutoDiff.h
@@ -727,10 +727,7 @@ template <> struct DenseMapInfo<AutoDiffConfig> {
   }
 
   static unsigned getHashValue(const AutoDiffConfig &Val) {
-    auto canGenSig =
-        Val.derivativeGenericSignature
-            ? Val.derivativeGenericSignature->getCanonicalSignature()
-            : nullptr;
+    auto canGenSig = Val.derivativeGenericSignature.getCanonicalSignature();
     unsigned combinedHash = hash_combine(
         ~1U, DenseMapInfo<void *>::getHashValue(Val.parameterIndices),
         DenseMapInfo<void *>::getHashValue(Val.resultIndices),
@@ -739,14 +736,8 @@ template <> struct DenseMapInfo<AutoDiffConfig> {
   }
 
   static bool isEqual(const AutoDiffConfig &LHS, const AutoDiffConfig &RHS) {
-    auto lhsCanGenSig =
-        LHS.derivativeGenericSignature
-            ? LHS.derivativeGenericSignature->getCanonicalSignature()
-            : nullptr;
-    auto rhsCanGenSig =
-        RHS.derivativeGenericSignature
-            ? RHS.derivativeGenericSignature->getCanonicalSignature()
-            : nullptr;
+    auto lhsCanGenSig = LHS.derivativeGenericSignature.getCanonicalSignature();
+    auto rhsCanGenSig = RHS.derivativeGenericSignature.getCanonicalSignature();
     return LHS.parameterIndices == RHS.parameterIndices &&
            LHS.resultIndices == RHS.resultIndices &&
            DenseMapInfo<GenericSignature>::isEqual(lhsCanGenSig, rhsCanGenSig);
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
@@ -4912,7 +4912,7 @@ CanGenericSignature ASTContext::getOpenedArchetypeSignature(Type type) {
   // The opened archetype signature for a protocol type is identical
   // to the protocol's own canonical generic signature.
   if (const auto protoTy = dyn_cast<ProtocolType>(existential)) {
-    return protoTy->getDecl()->getGenericSignature()->getCanonicalSignature();
+    return protoTy->getDecl()->getGenericSignature().getCanonicalSignature();
   }
 
   auto found = getImpl().ExistentialSignatures.find(existential);
@@ -5273,9 +5273,7 @@ AutoDiffDerivativeFunctionIdentifier *AutoDiffDerivativeFunctionIdentifier::get(
   llvm::FoldingSetNodeID id;
   id.AddInteger((unsigned)kind);
   id.AddPointer(parameterIndices);
-  CanGenericSignature derivativeCanGenSig;
-  if (derivativeGenericSignature)
-    derivativeCanGenSig = derivativeGenericSignature->getCanonicalSignature();
+  auto derivativeCanGenSig = derivativeGenericSignature.getCanonicalSignature();
   id.AddPointer(derivativeCanGenSig.getPointer());
 
   void *insertPos;
diff --git a/lib/AST/GenericSignatureBuilder.cpp b/lib/AST/GenericSignatureBuilder.cpp
@@ -8611,9 +8611,7 @@ AbstractGenericSignatureRequest::evaluate(
   // generic signature builder.
   if (!isCanonicalRequest(baseSignature, addedParameters, addedRequirements)) {
     // Canonicalize the inputs so we can form the canonical request.
-    GenericSignature canBaseSignature;
-    if (baseSignature)
-      canBaseSignature = baseSignature->getCanonicalSignature();
+    auto canBaseSignature = baseSignature.getCanonicalSignature();
 
     SmallVector<GenericTypeParamType *, 2> canAddedParameters;
     canAddedParameters.reserve(addedParameters.size());
diff --git a/lib/AST/NameLookup.cpp b/lib/AST/NameLookup.cpp
@@ -702,13 +702,9 @@ static void recordShadowedDecls(ArrayRef<ValueDecl *> decls,
     if (decl->isRecursiveValidation())
       continue;
 
-    CanGenericSignature signature;
-
-    auto *dc = decl->getInnermostDeclContext();
-    if (auto genericSig = dc->getGenericSignatureOfContext())
-      signature = genericSig->getCanonicalSignature();
-
     // Record this declaration based on its signature.
+    auto *dc = decl->getInnermostDeclContext();
+    auto signature = dc->getGenericSignatureOfContext().getCanonicalSignature();
     auto &known = collisions[signature.getPointer()];
     if (known.size() == 1) {
       collisionSignatures.push_back(signature.getPointer());
diff --git a/lib/AST/ProtocolConformance.cpp b/lib/AST/ProtocolConformance.cpp
@@ -532,8 +532,8 @@ ConditionalRequirementsRequest::evaluate(Evaluator &evaluator,
   // something else. The most important bit is having the same type
   // parameters. (NB. if/when Swift gets parameterized extensions, this needs to
   // change.)
-  assert(typeSig->getCanonicalSignature().getGenericParams() ==
-         extensionSig->getCanonicalSignature().getGenericParams());
+  assert(typeSig.getCanonicalSignature().getGenericParams() ==
+         extensionSig.getCanonicalSignature().getGenericParams());
 
   // Find the requirements in the extension that aren't proved by the original
   // type, these are the ones that make the conformance conditional.
diff --git a/lib/IRGen/GenPointerAuth.cpp b/lib/IRGen/GenPointerAuth.cpp
@@ -523,7 +523,7 @@ static uint64_t getTypeHash(IRGenModule &IGM, CanSILFunctionType type) {
   auto genericSig = type->getInvocationGenericSignature();
   hashStringForFunctionType(
       IGM, type, Out,
-      genericSig ? genericSig->getCanonicalSignature()->getGenericEnvironment()
+      genericSig ? genericSig.getCanonicalSignature()->getGenericEnvironment()
                  : nullptr);
   return clang::CodeGen::computeStableStringHash(Out.str());
 }
@@ -533,7 +533,7 @@ static uint64_t getYieldTypesHash(IRGenModule &IGM, CanSILFunctionType type) {
   llvm::raw_svector_ostream out(buffer);
   auto genericSig = type->getInvocationGenericSignature();
   GenericEnvironment *genericEnv =
-      genericSig ? genericSig->getCanonicalSignature()->getGenericEnvironment()
+      genericSig ? genericSig.getCanonicalSignature()->getGenericEnvironment()
                  : nullptr;
 
   out << [&]() -> StringRef {
diff --git a/lib/SIL/IR/AbstractionPattern.cpp b/lib/SIL/IR/AbstractionPattern.cpp
@@ -630,7 +630,7 @@ AbstractionPattern::getObjCMethodAsyncCompletionHandlerType(
     if (auto origSig = getGenericSignature()) {
       patternSig = origSig;
     } else if (auto genFnTy = dyn_cast<GenericFunctionType>(getType())) {
-      patternSig = genFnTy->getGenericSignature()->getCanonicalSignature();
+      patternSig = genFnTy->getGenericSignature().getCanonicalSignature();
     }
     
     return AbstractionPattern(patternSig,
diff --git a/lib/SIL/IR/SILInstructions.cpp b/lib/SIL/IR/SILInstructions.cpp
@@ -781,9 +781,7 @@ SILType DifferentiabilityWitnessFunctionInst::getDifferentiabilityWitnessType(
     SILModule &module, DifferentiabilityWitnessFunctionKind witnessKind,
     SILDifferentiabilityWitness *witness) {
   auto fnTy = witness->getOriginalFunction()->getLoweredFunctionType();
-  CanGenericSignature witnessCanGenSig;
-  if (auto witnessGenSig = witness->getDerivativeGenericSignature())
-    witnessCanGenSig = witnessGenSig->getCanonicalSignature();
+  auto witnessCanGenSig = witness->getDerivativeGenericSignature().getCanonicalSignature();
   auto *parameterIndices = witness->getParameterIndices();
   auto *resultIndices = witness->getResultIndices();
   if (auto derivativeKind = witnessKind.getAsDerivativeFunctionKind()) {
diff --git a/lib/SIL/Verifier/SILVerifier.cpp b/lib/SIL/Verifier/SILVerifier.cpp
@@ -1445,8 +1445,8 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
       });
     }
 
-    if (subs.getGenericSignature()->getCanonicalSignature() !=
-          fnTy->getInvocationGenericSignature()->getCanonicalSignature()) {
+    if (subs.getGenericSignature().getCanonicalSignature() !=
+          fnTy->getInvocationGenericSignature().getCanonicalSignature()) {
       llvm::dbgs() << "substitution map's generic signature: ";
       subs.getGenericSignature()->print(llvm::dbgs());
       llvm::dbgs() << "\n";
diff --git a/lib/SILGen/ResultPlan.cpp b/lib/SILGen/ResultPlan.cpp
@@ -525,8 +525,7 @@ class ForeignAsyncInitializationPlan final : public ResultPlan {
       impFnTy = cast<SILFunctionType>(impTy.getASTType());
     }
     auto env = SGF.F.getGenericEnvironment();
-    auto sig = env ? env->getGenericSignature()->getCanonicalSignature()
-                   : CanGenericSignature();
+    auto sig = env->getGenericSignature().getCanonicalSignature();
     SILFunction *impl = SGF.SGM
       .getOrCreateForeignAsyncCompletionHandlerImplFunction(
                   cast<SILFunctionType>(impFnTy->mapTypeOutOfContext()
diff --git a/lib/SILGen/SILGenPoly.cpp b/lib/SILGen/SILGenPoly.cpp
@@ -3944,9 +3944,7 @@ SILFunction *SILGenModule::getOrCreateCustomDerivativeThunk(
                               : nullptr;
 
   auto origFnTy = originalFn->getLoweredFunctionType();
-  CanGenericSignature derivativeCanGenSig;
-  if (auto derivativeGenSig = config.derivativeGenericSignature)
-    derivativeCanGenSig = derivativeGenSig->getCanonicalSignature();
+  auto derivativeCanGenSig = config.derivativeGenericSignature.getCanonicalSignature();
   auto thunkFnTy = origFnTy->getAutoDiffDerivativeFunctionType(
       config.parameterIndices, config.resultIndices, kind, Types,
       LookUpConformanceInModule(M.getSwiftModule()), derivativeCanGenSig);
diff --git a/lib/SILOptimizer/Differentiation/JVPCloner.cpp b/lib/SILOptimizer/Differentiation/JVPCloner.cpp
@@ -1615,9 +1615,7 @@ void JVPCloner::Implementation::prepareForDifferentialGeneration() {
   // signature: when witness generic signature has same-type requirements
   // binding all generic parameters to concrete types, JVP function type uses
   // all the concrete types and JVP generic signature is null.
-  CanGenericSignature witnessCanGenSig;
-  if (auto witnessGenSig = witness->getDerivativeGenericSignature())
-    witnessCanGenSig = witnessGenSig->getCanonicalSignature();
+  auto witnessCanGenSig = witness->getDerivativeGenericSignature().getCanonicalSignature();
   auto lookupConformance = LookUpConformanceInModule(module.getSwiftModule());
 
   // Parameters of the differential are:
diff --git a/lib/SILOptimizer/Differentiation/LinearMapInfo.cpp b/lib/SILOptimizer/Differentiation/LinearMapInfo.cpp
@@ -371,10 +371,7 @@ void LinearMapInfo::generateDifferentiationDataStructures(
     ADContext &context, SILFunction *derivativeFn) {
   auto &astCtx = original->getASTContext();
   // Get the derivative function generic signature.
-  CanGenericSignature derivativeFnGenSig = nullptr;
-  if (auto *derivativeFnGenEnv = derivativeFn->getGenericEnvironment())
-    derivativeFnGenSig =
-        derivativeFnGenEnv->getGenericSignature()->getCanonicalSignature();
+  auto derivativeFnGenSig = derivativeFnGenEnv->getGenericSignature().getCanonicalSignature();
 
   // Create linear map struct for each original block.
   for (auto &origBB : *original) {
diff --git a/lib/SILOptimizer/Differentiation/Thunk.cpp b/lib/SILOptimizer/Differentiation/Thunk.cpp
@@ -104,7 +104,7 @@ CanGenericSignature buildThunkSignature(SILFunction *fn, bool inheritGenericSig,
       },
       MakeAbstractConformanceForGenericType());
 
-  return genericSig->getCanonicalSignature();
+  return genericSig.getCanonicalSignature();
 }
 
 CanSILFunctionType buildThunkType(SILFunction *fn,
diff --git a/lib/SILOptimizer/Differentiation/VJPCloner.cpp b/lib/SILOptimizer/Differentiation/VJPCloner.cpp
@@ -823,9 +823,7 @@ SILFunction *VJPCloner::Implementation::createEmptyPullback() {
   // signature: when witness generic signature has same-type requirements
   // binding all generic parameters to concrete types, VJP function type uses
   // all the concrete types and VJP generic signature is null.
-  CanGenericSignature witnessCanGenSig;
-  if (auto witnessGenSig = witness->getDerivativeGenericSignature())
-    witnessCanGenSig = witnessGenSig->getCanonicalSignature();
+  auto witnessCanGenSig = witness->getDerivativeGenericSignature()->getCanonicalSignature();
   auto lookupConformance = LookUpConformanceInModule(module.getSwiftModule());
 
   // Given a type, returns its formal SIL parameter info.
diff --git a/lib/SILOptimizer/Mandatory/Differentiation.cpp b/lib/SILOptimizer/Mandatory/Differentiation.cpp
@@ -779,9 +779,7 @@ static SILFunction *createEmptyVJP(ADContext &context,
   Mangle::DifferentiationMangler mangler;
   auto vjpName = mangler.mangleDerivativeFunction(
       original->getName(), AutoDiffDerivativeFunctionKind::VJP, config);
-  CanGenericSignature vjpCanGenSig;
-  if (auto vjpGenSig = witness->getDerivativeGenericSignature())
-    vjpCanGenSig = vjpGenSig->getCanonicalSignature();
+  auto vjpCanGenSig = witness->getDerivativeGenericSignature().getCanonicalSignature();
   GenericEnvironment *vjpGenericEnv = nullptr;
   if (vjpCanGenSig && !vjpCanGenSig->areAllParamsConcrete())
     vjpGenericEnv = vjpCanGenSig->getGenericEnvironment();
@@ -822,9 +820,7 @@ static SILFunction *createEmptyJVP(ADContext &context,
   Mangle::DifferentiationMangler mangler;
   auto jvpName = mangler.mangleDerivativeFunction(
       original->getName(), AutoDiffDerivativeFunctionKind::JVP, config);
-  CanGenericSignature jvpCanGenSig;
-  if (auto jvpGenSig = witness->getDerivativeGenericSignature())
-    jvpCanGenSig = jvpGenSig->getCanonicalSignature();
+  auto jvpCanGenSig = witness->getDerivativeGenericSignature().getCanonicalSignature();
   GenericEnvironment *jvpGenericEnv = nullptr;
   if (jvpCanGenSig && !jvpCanGenSig->areAllParamsConcrete())
     jvpGenericEnv = jvpCanGenSig->getGenericEnvironment();

Original file line number	Diff line number	Diff line change
`@@ -630,7 +630,7 @@ AbstractionPattern::getObjCMethodAsyncCompletionHandlerType(`
`630`	`630`	`if (auto origSig = getGenericSignature()) {`
`631`	`631`	`patternSig = origSig;`
`632`	`632`	`} else if (auto genFnTy = dyn_cast<GenericFunctionType>(getType())) {`
`633`		`- patternSig = genFnTy->getGenericSignature()->getCanonicalSignature();`
	`633`	`+ patternSig = genFnTy->getGenericSignature().getCanonicalSignature();`
`634`	`634`	`}`
`635`	`635`
`636`	`636`	`return AbstractionPattern(patternSig,`