Sema: Remove some unnecessary (void) getInterfaceType() calls

Author: slavapestov

lib/Sema/CodeSynthesis.cpp

@@ -685,7 +685,6 @@ createDesignatedInitOverride(ClassDecl *classDecl,
 
   // Set the interface type of the initializer.
   ctor->setGenericSignature(genericSig);
-  (void)ctor->getInterfaceType();
 
   ctor->setImplicitlyUnwrappedOptional(
     superclassCtor->isImplicitlyUnwrappedOptional());

lib/Sema/DerivedConformanceCodable.cpp

@@ -738,8 +738,6 @@ static FuncDecl *deriveEncodable_encode(DerivedConformance &derived) {
     encodeDecl->getAttrs().add(attr);
   }
 
-  (void)encodeDecl->getInterfaceType();
-
   encodeDecl->copyFormalAccessFrom(derived.Nominal,
                                    /*sourceIsParentContext*/ true);
 
@@ -1018,8 +1016,6 @@ static ValueDecl *deriveDecodable_init(DerivedConformance &derived) {
     initDecl->getAttrs().add(reqAttr);
   }
 
-  (void)initDecl->getInterfaceType();
-
   initDecl->copyFormalAccessFrom(derived.Nominal,
                                  /*sourceIsParentContext*/ true);
 

lib/Sema/DerivedConformanceCodingKey.cpp

@@ -143,9 +143,6 @@ static ValueDecl *deriveInitDecl(DerivedConformance &derived, Type paramType,
   // Synthesize the body.
   synthesizer(initDecl);
 
-  // Compute the interface type of the initializer.
-  (void)initDecl->getInterfaceType();
-
   initDecl->setAccess(derived.Nominal->getFormalAccess());
 
   C.addSynthesizedDecl(initDecl);

lib/Sema/DerivedConformanceEquatableHashable.cpp

@@ -767,9 +767,6 @@ deriveEquatable_eq(
 
   eqDecl->setBodySynthesizer(bodySynthesizer);
 
-  // Compute the interface type.
-  (void)eqDecl->getInterfaceType();
-
   eqDecl->copyFormalAccessFrom(derived.Nominal, /*sourceIsParentContext*/ true);
 
   C.addSynthesizedDecl(eqDecl);
@@ -891,7 +888,6 @@ deriveHashable_hashInto(
   hashDecl->setImplicit();
   hashDecl->setBodySynthesizer(bodySynthesizer);
 
-  (void)hashDecl->getInterfaceType();
   hashDecl->copyFormalAccessFrom(derived.Nominal);
 
   C.addSynthesizedDecl(hashDecl);
@@ -1238,9 +1234,6 @@ static ValueDecl *deriveHashable_hashValue(DerivedConformance &derived) {
   getterDecl->setBodySynthesizer(&deriveBodyHashable_hashValue);
   getterDecl->setIsTransparent(false);
 
-  // Compute the interface type of hashValue().
-  (void)getterDecl->getInterfaceType();
-
   getterDecl->copyFormalAccessFrom(derived.Nominal,
                                    /*sourceIsParentContext*/ true);
 

lib/Sema/DerivedConformanceRawRepresentable.cpp

@@ -428,9 +428,6 @@ deriveRawRepresentable_init(DerivedConformance &derived) {
   initDecl->setImplicit();
   initDecl->setBodySynthesizer(&deriveBodyRawRepresentable_init);
 
-  // Compute the interface type of the initializer.
-  (void)initDecl->getInterfaceType();
-
   initDecl->copyFormalAccessFrom(enumDecl, /*sourceIsParentContext*/true);
 
   // If the containing module is not resilient, make sure clients can construct

lib/Sema/DerivedConformances.cpp

@@ -309,9 +309,6 @@ DerivedConformance::declareDerivedPropertyGetter(VarDecl *property,
   getterDecl->setImplicit();
   getterDecl->setIsTransparent(false);
 
-  // Compute the interface type of the getter.
-  (void)getterDecl->getInterfaceType();
-
   getterDecl->copyFormalAccessFrom(property);
 
   C.addSynthesizedDecl(getterDecl);

lib/Sema/LookupVisibleDecls.cpp

@@ -282,9 +282,6 @@ static void doDynamicLookup(VisibleDeclConsumer &Consumer,
       if (D->isRecursiveValidation())
         return;
 
-      // FIXME: This is used to compute isInvalid() below.
-      (void) D->getInterfaceType();
-
       switch (D->getKind()) {
 #define DECL(ID, SUPER) \
       case DeclKind::ID:
@@ -430,8 +427,6 @@ static void lookupDeclsFromProtocolsBeingConformedTo(
           continue;
         }
         if (auto *VD = dyn_cast<ValueDecl>(Member)) {
-          // FIXME(InterfaceTypeRequest): Remove this.
-          (void)VD->getInterfaceType();
           if (auto *TypeResolver = VD->getASTContext().getLazyResolver()) {
             if (!NormalConformance->hasWitness(VD) &&
                 (Conformance->getDeclContext()->getParentSourceFile() !=

lib/Sema/TypeCheckAttr.cpp

@@ -1071,8 +1071,6 @@ bool swift::isValidDynamicCallableMethod(FuncDecl *decl, DeclContext *DC,
   //    `ExpressibleByStringLiteral`.
   //    `D.Value` and the return type can be arbitrary.
 
-  // FIXME(InterfaceTypeRequest): Remove this.
-  (void)decl->getInterfaceType();
   auto paramList = decl->getParameters();
   if (paramList->size() != 1 || paramList->get(0)->isVariadic()) return false;
   auto argType = paramList->get(0)->getType();
@@ -1242,8 +1240,6 @@ visitDynamicMemberLookupAttr(DynamicMemberLookupAttr *attr) {
     auto oneCandidate = candidates.front().getValueDecl();
     candidates.filter([&](LookupResultEntry entry, bool isOuter) -> bool {
       auto cand = cast<SubscriptDecl>(entry.getValueDecl());
-      // FIXME(InterfaceTypeRequest): Remove this.
-      (void)cand->getInterfaceType();
       return isValidDynamicMemberLookupSubscript(cand, decl);
     });
 
@@ -1266,8 +1262,6 @@ visitDynamicMemberLookupAttr(DynamicMemberLookupAttr *attr) {
   // Validate the candidates while ignoring the label.
   newCandidates.filter([&](const LookupResultEntry entry, bool isOuter) {
     auto cand = cast<SubscriptDecl>(entry.getValueDecl());
-    // FIXME(InterfaceTypeRequest): Remove this.
-    (void)cand->getInterfaceType();
     return isValidDynamicMemberLookupSubscript(cand, decl,
                                                /*ignoreLabel*/ true);
   });
@@ -2111,9 +2105,6 @@ static Type getDynamicComparisonType(ValueDecl *value) {
   }
 
   auto interfaceType = value->getInterfaceType();
-  if (!interfaceType)
-    return ErrorType::get(value->getASTContext());
-
   return interfaceType->removeArgumentLabels(numArgumentLabels);
 }
 
@@ -2177,8 +2168,6 @@ static FuncDecl *findReplacedAccessor(DeclName replacedVarName,
 
   assert(!isa<FuncDecl>(results[0]));
 
-  // FIXME(InterfaceTypeRequest): Remove this.
-  (void)results[0]->getInterfaceType();
   auto *origStorage = cast<AbstractStorageDecl>(results[0]);
   if (!origStorage->isDynamic()) {
     Diags.diagnose(attr->getLocation(),
@@ -2194,8 +2183,6 @@ static FuncDecl *findReplacedAccessor(DeclName replacedVarName,
   if (!origAccessor)
     return nullptr;
 
-  // FIXME(InterfaceTypeRequest): Remove this.
-  (void)origAccessor->getInterfaceType();
   if (origAccessor->isImplicit() &&
       !(origStorage->getReadImpl() == ReadImplKind::Stored &&
         origStorage->getWriteImpl() == WriteImplKind::Stored)) {
@@ -2348,8 +2335,6 @@ void AttributeChecker::visitDynamicReplacementAttr(DynamicReplacementAttr *attr)
       if (attr->isInvalid())
         return;
 
-      // FIXME(InterfaceTypeRequest): Remove this.
-      (void)accessor->getInterfaceType();
        auto *orig = findReplacedAccessor(attr->getReplacedFunctionName(),
                                          accessor, attr, Ctx);
        if (!orig)

lib/Sema/TypeCheckConstraints.cpp

@@ -229,7 +229,7 @@ static bool containsDeclRefKind(LookupResult &lookupResult,
                                 DeclRefKind refKind) {
   for (auto candidate : lookupResult) {
     ValueDecl *D = candidate.getValueDecl();
-    if (!D || !D->hasInterfaceType())
+    if (!D)
       continue;
     if (matchesDeclRefKind(D, refKind))
       return true;

lib/Sema/TypeCheckDeclObjC.cpp

@@ -487,8 +487,7 @@ bool swift::isRepresentableInObjC(
 
   // If you change this function, you must add or modify a test in PrintAsObjC.
   ASTContext &ctx = AFD->getASTContext();
-  // FIXME(InterfaceTypeRequest): Remove this.
-  (void)AFD->getInterfaceType();
+
   bool Diagnose = shouldDiagnoseObjCReason(Reason, ctx);
 
   if (checkObjCInForeignClassContext(AFD, Reason))
@@ -982,50 +981,6 @@ Type TypeChecker::getObjCSelectorType(DeclContext *dc) {
                                   dc);
 }
 
-#pragma mark Bridging support
-
-/// Check runtime functions responsible for implicit bridging of Objective-C
-/// types.
-static void checkObjCBridgingFunctions(ModuleDecl *mod,
-                                       StringRef bridgedTypeName,
-                                       StringRef forwardConversion,
-                                       StringRef reverseConversion) {
-  assert(mod);
-  SmallVector<ValueDecl *, 4> results;
-
-  auto &ctx = mod->getASTContext();
-  mod->lookupValue(ctx.getIdentifier(bridgedTypeName),
-                   NLKind::QualifiedLookup, results);
-  mod->lookupValue(ctx.getIdentifier(forwardConversion),
-                   NLKind::QualifiedLookup, results);
-  mod->lookupValue(ctx.getIdentifier(reverseConversion),
-                   NLKind::QualifiedLookup, results);
-
-  for (auto D : results) {
-    // FIXME(InterfaceTypeRequest): Remove this.
-    (void)D->getInterfaceType();
-  }
-}
-
-void swift::checkBridgedFunctions(ASTContext &ctx) {
-  #define BRIDGE_TYPE(BRIDGED_MOD, BRIDGED_TYPE, _, NATIVE_TYPE, OPT) \
-  Identifier ID_##BRIDGED_MOD = ctx.getIdentifier(#BRIDGED_MOD);\
-  if (ModuleDecl *module = ctx.getLoadedModule(ID_##BRIDGED_MOD)) {\
-    checkObjCBridgingFunctions(module, #BRIDGED_TYPE, \
-    "_convert" #BRIDGED_TYPE "To" #NATIVE_TYPE, \
-    "_convert" #NATIVE_TYPE "To" #BRIDGED_TYPE); \
-  }
-  #include "swift/SIL/BridgedTypes.def"
-
-  if (ModuleDecl *module = ctx.getLoadedModule(ctx.Id_Foundation)) {
-    checkObjCBridgingFunctions(module,
-                               ctx.getSwiftName(
-                                 KnownFoundationEntity::NSError),
-                               "_convertNSErrorToError",
-                               "_convertErrorToNSError");
-  }
-}
-
 #pragma mark "@objc declaration handling"
 
 /// Whether this declaration is a member of a class extension marked @objc.

lib/Sema/TypeCheckObjC.h

@@ -135,11 +135,6 @@ bool isRepresentableInObjC(const SubscriptDecl *SD, ObjCReason Reason);
 /// Check whether the given declaration can be represented in Objective-C.
 bool canBeRepresentedInObjC(const ValueDecl *decl);
 
-/// Check that specific, known bridging functions are fully type-checked.
-///
-/// NOTE: This is only here to support the --enable-source-import hack.
-void checkBridgedFunctions(ASTContext &ctx);
-
 /// Attach Fix-Its to the given diagnostic that updates the name of the
 /// given declaration to the desired target name.
 ///

lib/Sema/TypeCheckPropertyWrapper.cpp

@@ -546,8 +546,6 @@ PropertyWrapperBackingPropertyTypeRequest::evaluate(
   }
 
   // Compute the type of the property to plug in to the wrapper type.
-  // FIXME(InterfaceTypeRequest): Remove this.
-  (void)var->getInterfaceType();
   Type propertyType = var->getType();
   if (!propertyType || propertyType->hasError())
     return Type();

lib/Sema/TypeCheckStmt.cpp

@@ -2065,9 +2065,6 @@ TypeCheckFunctionBodyUntilRequest::evaluate(Evaluator &evaluator,
   if (tc.DebugTimeFunctionBodies || tc.WarnLongFunctionBodies)
     timer.emplace(AFD, tc.DebugTimeFunctionBodies, tc.WarnLongFunctionBodies);
 
-  // FIXME(InterfaceTypeRequest): Remove this.
-  (void)AFD->getInterfaceType();
-
   BraceStmt *body = AFD->getBody();
   if (!body || AFD->isBodyTypeChecked())
     return false;

lib/Sema/TypeChecker.cpp

@@ -424,10 +424,6 @@ void swift::performTypeChecking(SourceFile &SF, TopLevelContext &TLC,
     // to work.
     bindExtensions(SF);
 
-    // Look for bridging functions. This only matters when
-    // -enable-source-import is provided.
-    checkBridgedFunctions(TC.Context);
-
     // Type check the top-level elements of the source file.
     for (auto D : llvm::makeArrayRef(SF.Decls).slice(StartElem)) {
       if (auto *TLCD = dyn_cast<TopLevelCodeDecl>(D)) {