Sema: Remove GenericTypeResolver::recordParamType()

Author: slavapestov

lib/Sema/GenericTypeResolver.h

@@ -57,9 +57,6 @@ class GenericTypeResolver {
   /// Determine whether the given types are equivalent within the generic
   /// context.
   virtual bool areSameType(Type type1, Type type2) = 0;
-
-  /// Set the contextual type or the interface type of the parameter.
-  virtual void recordParamType(ParamDecl *decl, Type ty) = 0;
 };
 
 /// Generic type resolver that leaves all generic types dependent.
@@ -78,8 +75,6 @@ class DependentGenericTypeResolver : public GenericTypeResolver {
                                           ComponentIdentTypeRepr *ref);
 
   virtual bool areSameType(Type type1, Type type2);
-
-  virtual void recordParamType(ParamDecl *decl, Type ty);
 };
 
 /// Generic type resolver that maps a generic type parameter type to its
@@ -106,8 +101,6 @@ class GenericTypeToArchetypeResolver : public GenericTypeResolver {
                                           ComponentIdentTypeRepr *ref);
 
   virtual bool areSameType(Type type1, Type type2);
-
-  virtual void recordParamType(ParamDecl *decl, Type ty);
 };
 
 /// Generic type resolver that only handles what can appear in a protocol
@@ -126,8 +119,6 @@ class ProtocolRequirementTypeResolver : public GenericTypeResolver {
                                           ComponentIdentTypeRepr *ref);
 
   virtual bool areSameType(Type type1, Type type2);
-
-  virtual void recordParamType(ParamDecl *decl, Type ty);
 };
 
 /// Generic type resolver that performs complete resolution of dependent
@@ -155,8 +146,6 @@ class CompleteGenericTypeResolver : public GenericTypeResolver {
                                           ComponentIdentTypeRepr *ref);
 
   virtual bool areSameType(Type type1, Type type2);
-
-  virtual void recordParamType(ParamDecl *decl, Type ty);
 };
 
 } // end namespace swift

lib/Sema/TypeCheckDecl.cpp

@@ -4116,7 +4116,7 @@ void TypeChecker::validateDecl(ValueDecl *D) {
           auto accessorParam = valueParams->get(valueParams->size() - e + i);
           accessorParam->setType(paramTy);
           accessorParam->setInterfaceType(paramIfaceTy);
-          accessorParam->getTypeLoc().setType(paramTy);
+          accessorParam->getTypeLoc().setType(paramIfaceTy);
         }
       }
 

lib/Sema/TypeCheckGeneric.cpp

@@ -50,10 +50,6 @@ bool DependentGenericTypeResolver::areSameType(Type type1, Type type2) {
   return true;
 }
 
-void DependentGenericTypeResolver::recordParamType(ParamDecl *decl, Type type) {
-  // Do nothing
-}
-
 Type GenericTypeToArchetypeResolver::mapTypeIntoContext(Type type) {
   return GenericEnvironment::mapTypeIntoContext(GenericEnv, type);
 }
@@ -70,19 +66,6 @@ bool GenericTypeToArchetypeResolver::areSameType(Type type1, Type type2) {
   return type1->isEqual(type2);
 }
 
-void GenericTypeToArchetypeResolver::recordParamType(ParamDecl *decl, Type type) {
-  decl->setType(type);
-
-  // When type checking a closure or subscript index, this is the only
-  // resolver that runs, so make sure we also set the interface type,
-  // if one was not already set.
-  //
-  // When type checking functions, the CompleteGenericTypeResolver sets
-  // the interface type.
-  if (!decl->hasInterfaceType())
-    decl->setInterfaceType(type->mapTypeOutOfContext());
-}
-
 Type ProtocolRequirementTypeResolver::mapTypeIntoContext(Type type) {
   return type;
 }
@@ -110,12 +93,6 @@ bool ProtocolRequirementTypeResolver::areSameType(Type type1, Type type2) {
   return areSameType(depMem1->getBase(), depMem2->getBase());
 }
 
-void ProtocolRequirementTypeResolver::recordParamType(ParamDecl *decl,
-                                                      Type type) {
-  llvm_unreachable(
-      "recording a param type of a protocol requirement doesn't make sense");
-}
-
 CompleteGenericTypeResolver::CompleteGenericTypeResolver(
                                               TypeChecker &tc,
                                               GenericSignature *genericSig)
@@ -242,11 +219,6 @@ bool CompleteGenericTypeResolver::areSameType(Type type1, Type type2) {
            == genericSig->getCanonicalTypeInContext(type2);
 }
 
-void
-CompleteGenericTypeResolver::recordParamType(ParamDecl *decl, Type type) {
-  decl->setInterfaceType(type);
-}
-
 ///
 /// Common code for generic functions, generic types
 ///

lib/Sema/TypeCheckPattern.cpp

@@ -856,10 +856,9 @@ bool TypeChecker::typeCheckParameterList(ParameterList *PL, DeclContext *DC,
       param->markInvalid();
       hadError = true;
     } else {
-      if (!type->isMaterializable()) {
+      if (type->is<InOutType>())
         param->setSpecifier(VarDecl::Specifier::InOut);
-      }
-      resolver.recordParamType(param, type->getInOutObjectType());
+      param->setInterfaceType(type->getInOutObjectType());
     }
 
     checkTypeModifyingDeclAttributes(param);