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

Author: slavapestov

lib/ClangImporter/ImportDecl.cpp

@@ -552,7 +552,7 @@ synthesizeEnumRawValueGetterBody(AbstractFunctionDecl *afd, void *context) {
   auto getterDecl = cast<AccessorDecl>(afd);
   auto enumDecl = static_cast<EnumDecl *>(context);
   auto rawTy = enumDecl->getRawType();
-  auto enumTy = enumDecl->getDeclaredType();
+  auto enumTy = enumDecl->getDeclaredInterfaceType();
 
   ASTContext &ctx = getterDecl->getASTContext();
   auto *selfDecl = getterDecl->getImplicitSelfDecl();
@@ -1892,7 +1892,7 @@ static bool addErrorDomain(NominalTypeDecl *swiftDecl,
   auto &C = importer.SwiftContext;
   auto swiftValueDecl = dyn_cast_or_null<ValueDecl>(
       importer.importDecl(errorDomainDecl, importer.CurrentVersion));
-  auto stringTy = C.getStringDecl()->getDeclaredType();
+  auto stringTy = C.getStringDecl()->getDeclaredInterfaceType();
   assert(stringTy && "no string type available");
   if (!swiftValueDecl || !swiftValueDecl->getInterfaceType()->isEqual(stringTy)) {
     // Couldn't actually import it as an error enum, fall back to enum
@@ -6962,7 +6962,8 @@ void SwiftDeclConverter::importObjCProtocols(
     if (auto proto = castIgnoringCompatibilityAlias<ProtocolDecl>(
             Impl.importDecl(*cp, getActiveSwiftVersion()))) {
       addProtocols(proto, protocols, knownProtocols);
-      inheritedTypes.push_back(TypeLoc::withoutLoc(proto->getDeclaredType()));
+      inheritedTypes.push_back(
+        TypeLoc::withoutLoc(proto->getDeclaredInterfaceType()));
     }
   }
 
@@ -7013,7 +7014,8 @@ Optional<GenericParamList *> SwiftDeclConverter::importObjCGenericParams(
         if (!proto) {
           return None;
         }
-        inherited.push_back(TypeLoc::withoutLoc(proto->getDeclaredType()));
+        inherited.push_back(
+          TypeLoc::withoutLoc(proto->getDeclaredInterfaceType()));
       }
     }
     if (inherited.empty()) {

lib/ClangImporter/ImportMacro.cpp

@@ -558,38 +558,38 @@ static ValueDecl *importMacro(ClangImporter::Implementation &impl,
     } else if (tokenI[1].is(clang::tok::pipepipe)) {
       bool result  = firstValue.getBoolValue() || secondValue.getBoolValue();
       resultValue  = llvm::APSInt::get(result);
-      resultSwiftType = impl.SwiftContext.getBoolDecl()->getDeclaredType();
+      resultSwiftType = impl.SwiftContext.getBoolDecl()->getDeclaredInterfaceType();
 
     // Logical AND.
     } else if (tokenI[1].is(clang::tok::ampamp)) {
       bool result  = firstValue.getBoolValue() && secondValue.getBoolValue();
       resultValue  = llvm::APSInt::get(result);
-      resultSwiftType = impl.SwiftContext.getBoolDecl()->getDeclaredType();
+      resultSwiftType = impl.SwiftContext.getBoolDecl()->getDeclaredInterfaceType();
 
     // Equality.
     } else if (tokenI[1].is(clang::tok::equalequal)) {
       resultValue     = llvm::APSInt::get(firstValue == secondValue);
-      resultSwiftType = impl.SwiftContext.getBoolDecl()->getDeclaredType();
+      resultSwiftType = impl.SwiftContext.getBoolDecl()->getDeclaredInterfaceType();
 
     // Less than.
     } else if (tokenI[1].is(clang::tok::less)) {
       resultValue     = llvm::APSInt::get(firstValue < secondValue);
-      resultSwiftType = impl.SwiftContext.getBoolDecl()->getDeclaredType();
+      resultSwiftType = impl.SwiftContext.getBoolDecl()->getDeclaredInterfaceType();
 
     // Less than or equal.
     } else if (tokenI[1].is(clang::tok::lessequal)) {
       resultValue     = llvm::APSInt::get(firstValue <= secondValue);
-      resultSwiftType = impl.SwiftContext.getBoolDecl()->getDeclaredType();
+      resultSwiftType = impl.SwiftContext.getBoolDecl()->getDeclaredInterfaceType();
 
     // Greater than.
     } else if (tokenI[1].is(clang::tok::greater)) {
       resultValue     = llvm::APSInt::get(firstValue > secondValue);
-      resultSwiftType = impl.SwiftContext.getBoolDecl()->getDeclaredType();
+      resultSwiftType = impl.SwiftContext.getBoolDecl()->getDeclaredInterfaceType();
 
     // Greater than or equal.
     } else if (tokenI[1].is(clang::tok::greaterequal)) {
       resultValue     = llvm::APSInt::get(firstValue >= secondValue);
-      resultSwiftType = impl.SwiftContext.getBoolDecl()->getDeclaredType();
+      resultSwiftType = impl.SwiftContext.getBoolDecl()->getDeclaredInterfaceType();
 
     // Unhandled operators.
     } else {

lib/ClangImporter/ImportType.cpp

@@ -180,7 +180,7 @@ namespace {
     if (!opaquePointer) {
       return Type();
     }
-    return {opaquePointer->getDeclaredType(),
+    return {opaquePointer->getDeclaredInterfaceType(),
             type.isReferenceType() ? ImportHint::None
                                     : ImportHint::OtherPointer};
   }
@@ -417,7 +417,7 @@ namespace {
            : Impl.SwiftContext.getUnsafeMutableRawPointerDecl());
         if (!pointerTypeDecl)
           return Type();
-        return {pointerTypeDecl->getDeclaredType(),
+        return {pointerTypeDecl->getDeclaredInterfaceType(),
                 ImportHint::OtherPointer};
       }
 
@@ -964,7 +964,7 @@ namespace {
                 memberTypes.push_back(superclassType);
 
               for (auto protocolDecl : typeParam->getConformingProtocols())
-                memberTypes.push_back(protocolDecl->getDeclaredType());
+                memberTypes.push_back(protocolDecl->getDeclaredInterfaceType());
 
               bool hasExplicitAnyObject = false;
               if (memberTypes.empty())
@@ -980,7 +980,7 @@ namespace {
           importedType = BoundGenericClassType::get(
             imported, nullptr, importedTypeArgs);
         } else {
-          importedType = imported->getDeclaredType();
+          importedType = imported->getDeclaredInterfaceType();
         }
 
         if (!type->qual_empty()) {
@@ -1028,7 +1028,7 @@ namespace {
         if (auto objcClassDef = objcClass->getDefinition())
           bridgedType = mapSwiftBridgeAttr(objcClassDef);
         else if (objcClass->getName() == "NSString")
-          bridgedType = Impl.SwiftContext.getStringDecl()->getDeclaredType();
+          bridgedType = Impl.SwiftContext.getStringDecl()->getDeclaredInterfaceType();
 
         if (bridgedType) {
           // Gather the type arguments.
@@ -1083,7 +1083,7 @@ namespace {
                   keyStructDecl == Impl.SwiftContext.getDictionaryDecl() ||
                   keyStructDecl == Impl.SwiftContext.getArrayDecl()) {
                 if (auto anyHashable = Impl.SwiftContext.getAnyHashableDecl())
-                  keyType = anyHashable->getDeclaredType();
+                  keyType = anyHashable->getDeclaredInterfaceType();
                 else
                   keyType = Type();
               }
@@ -1124,7 +1124,7 @@ namespace {
           if (!proto)
             return Type();
 
-          members.push_back(proto->getDeclaredType());
+          members.push_back(proto->getDeclaredInterfaceType());
         }
 
         importedType = ProtocolCompositionType::get(Impl.SwiftContext,
@@ -1409,14 +1409,14 @@ static ImportedType adjustTypeForConcreteImport(
     // Turn BOOL and DarwinBoolean into Bool in contexts that can bridge types
     // losslessly.
     if (bridging == Bridgeability::Full && canBridgeTypes(importKind))
-      importedType = impl.SwiftContext.getBoolDecl()->getDeclaredType();
+      importedType = impl.SwiftContext.getBoolDecl()->getDeclaredInterfaceType();
     break;
 
   case ImportHint::NSUInteger:
     // When NSUInteger is used as an enum's underlying type or if it does not
     // come from a system module, make sure it stays unsigned.
     if (importKind == ImportTypeKind::Enum || !allowNSUIntegerAsInt)
-      importedType = impl.SwiftContext.getUIntDecl()->getDeclaredType();
+      importedType = impl.SwiftContext.getUIntDecl()->getDeclaredInterfaceType();
     break;
 
   case ImportHint::CFPointer:
@@ -1647,7 +1647,7 @@ ImportedType ClangImporter::Implementation::importFunctionReturnType(
     switch (getClangASTContext().BuiltinInfo.getTypeString(builtinID)[0]) {
     case 'z': // size_t
     case 'Y': // ptrdiff_t
-      return {SwiftContext.getIntDecl()->getDeclaredType(), false};
+      return {SwiftContext.getIntDecl()->getDeclaredInterfaceType(), false};
     default:
       break;
     }
@@ -2462,7 +2462,7 @@ Type ClangImporter::Implementation::getNSObjectType() {
     return NSObjectTy;
 
   if (auto decl = dyn_cast_or_null<ClassDecl>(importDeclByName("NSObject"))) {
-    NSObjectTy = decl->getDeclaredType();
+    NSObjectTy = decl->getDeclaredInterfaceType();
     return NSObjectTy;
   }
 
@@ -2528,7 +2528,7 @@ static Type getNamedProtocolType(ClangImporter::Implementation &impl,
             impl.importDecl(decl->getUnderlyingDecl(), impl.CurrentVersion)) {
       if (auto protoDecl =
               dynCastIgnoringCompatibilityAlias<ProtocolDecl>(swiftDecl)) {
-        return protoDecl->getDeclaredType();
+        return protoDecl->getDeclaredInterfaceType();
       }
     }
   }