SIL: Replace some calls to getDeclaredType() with getDeclaredInterfaceType()

Author: slavapestov

lib/SIL/IR/SILDefaultWitnessTable.cpp

@@ -97,7 +97,8 @@ convertToDefinition(ArrayRef<Entry> entries) {
 
 std::string SILDefaultWitnessTable::getUniqueName() const {
   Mangle::ASTMangler Mangler;
-  return Mangler.mangleTypeWithoutPrefix(getProtocol()->getDeclaredType());
+  return Mangler.mangleTypeWithoutPrefix(
+    getProtocol()->getDeclaredInterfaceType());
 }
 
 SILDefaultWitnessTable::~SILDefaultWitnessTable() {

lib/SIL/IR/SILFunctionType.cpp

@@ -1177,8 +1177,8 @@ class SubstFunctionTypeCollector {
     for (unsigned i : indices(upperBoundConformances)) {
       auto proto = upperBoundConformances[i];
       auto conformance = substTypeConformances[i];
-      substRequirements.push_back(Requirement(RequirementKind::Conformance,
-                                              param, proto->getDeclaredType()));
+      substRequirements.push_back(Requirement(RequirementKind::Conformance, param,
+                                              proto->getDeclaredInterfaceType()));
       substConformances.push_back(conformance);
     }
 

lib/SIL/Parser/ParseSIL.cpp

@@ -1780,7 +1780,7 @@ SubstitutionMap getApplySubstitutionsFromParsed(
           return conformance;
 
         SP.P.diagnose(loc, diag::sil_substitution_mismatch, replacementType,
-                      proto->getDeclaredType());
+                      proto->getDeclaredInterfaceType());
         failed = true;
 
         return ProtocolConformanceRef(proto);

lib/SIL/Utils/DynamicCasts.cpp

@@ -205,7 +205,7 @@ static CanType getHashableExistentialType(ModuleDecl *M) {
   auto hashable =
     M->getASTContext().getProtocol(KnownProtocolKind::Hashable);
   if (!hashable) return CanType();
-  return hashable->getDeclaredType()->getCanonicalType();
+  return hashable->getDeclaredInterfaceType()->getCanonicalType();
 }
 
 /// Check if a given type conforms to _BridgedToObjectiveC protocol.

lib/SILGen/SILGenExpr.cpp

@@ -1868,7 +1868,7 @@ RValue SILGenFunction::emitAnyHashableErasure(SILLocation loc,
   auto convertFn = SGM.getConvertToAnyHashable(loc);
   if (!convertFn)
     return emitUndefRValue(
-        loc, getASTContext().getAnyHashableDecl()->getDeclaredType());
+        loc, getASTContext().getAnyHashableDecl()->getDeclaredInterfaceType());
 
   // Construct the substitution for T: Hashable.
   auto subMap = SubstitutionMap::getProtocolSubstitutions(
@@ -2742,7 +2742,7 @@ static SILFunction *getOrCreateKeyPathGetter(SILGenModule &SGM,
     params.push_back({loweredBaseTy, paramConvention});
     auto &C = SGM.getASTContext();
     if (!indexes.empty())
-      params.push_back({C.getUnsafeRawPointerDecl()->getDeclaredType()
+      params.push_back({C.getUnsafeRawPointerDecl()->getDeclaredInterfaceType()
                                                    ->getCanonicalType(),
                         ParameterConvention::Direct_Unowned});
 
@@ -2893,7 +2893,7 @@ static SILFunction *getOrCreateKeyPathSetter(SILGenModule &SGM,
                         : paramConvention});
     // indexes
     if (!indexes.empty())
-      params.push_back({C.getUnsafeRawPointerDecl()->getDeclaredType()
+      params.push_back({C.getUnsafeRawPointerDecl()->getDeclaredInterfaceType()
                                                    ->getCanonicalType(),
                         ParameterConvention::Direct_Unowned});
 
@@ -3040,10 +3040,10 @@ getOrCreateKeyPathEqualsAndHash(SILGenModule &SGM,
   }
 
   auto &C = SGM.getASTContext();
-  auto unsafeRawPointerTy = C.getUnsafeRawPointerDecl()->getDeclaredType()
+  auto unsafeRawPointerTy = C.getUnsafeRawPointerDecl()->getDeclaredInterfaceType()
                                                        ->getCanonicalType();
-  auto boolTy = C.getBoolDecl()->getDeclaredType()->getCanonicalType();
-  auto intTy = C.getIntDecl()->getDeclaredType()->getCanonicalType();
+  auto boolTy = C.getBoolDecl()->getDeclaredInterfaceType()->getCanonicalType();
+  auto intTy = C.getIntDecl()->getDeclaredInterfaceType()->getCanonicalType();
 
   auto hashableProto = C.getProtocol(KnownProtocolKind::Hashable);
 

lib/SILOptimizer/Differentiation/PullbackCloner.cpp

@@ -2823,7 +2823,7 @@ AllocStackInst *PullbackCloner::Implementation::getArrayAdjointElementBuffer(
   auto *eltIndexLiteral =
       builder.createIntegerLiteral(loc, builtinIntType, eltIndex);
   auto intType = SILType::getPrimitiveObjectType(
-      ctx.getIntDecl()->getDeclaredType()->getCanonicalType());
+      ctx.getIntDecl()->getDeclaredInterfaceType()->getCanonicalType());
   // %index_int = struct $Int (%index_literal)
   auto *eltIndexInt = builder.createStruct(loc, intType, {eltIndexLiteral});
   auto *swiftModule = getModule().getSwiftModule();

lib/SILOptimizer/Transforms/StringOptimization.cpp

@@ -108,7 +108,7 @@ bool StringOptimization::run(SILFunction *F) {
   if (!stringDecl)
     return false;
   stringType = SILType::getPrimitiveObjectType(
-                 CanType(stringDecl->getDeclaredType()));
+                 stringDecl->getDeclaredInterfaceType()->getCanonicalType());
 
   bool changed = false;
 

lib/SILOptimizer/Utils/Existential.cpp

@@ -400,7 +400,7 @@ ConcreteExistentialInfo::ConcreteExistentialInfo(SILValue existential,
   // There is no ConcreteValue in this case.
 
   /// Determine the ExistentialConformances and SubstitutionMap.
-  ExistentialType = Protocol->getDeclaredType()->getCanonicalType();
+  ExistentialType = Protocol->getDeclaredInterfaceType()->getCanonicalType();
   initializeSubstitutionMap(ProtocolConformanceRef(ConcreteConformance), M);
 
   assert(isValid());