Merge pull request #42452 from zoecarver/method-param-types-use-enum-not-typedef

[cxx-interop] Apply typedef -> enum patch to method param types as well.

Author: zoecarver

lib/ClangImporter/ImportType.cpp

@@ -2747,10 +2747,28 @@ ImportedType ClangImporter::Implementation::importMethodParamsAndReturnType(
   ImportDiagnosticAdder addImportDiag(*this, clangDecl,
                                       clangDecl->getLocation());
   clang::QualType resultType = clangDecl->getReturnType();
-  auto importedType =
-      importType(resultType, resultKind, addImportDiag,
-                 allowNSUIntegerAsIntInResult, Bridgeability::Full,
-                 getImportTypeAttrs(clangDecl), OptionalityOfReturn);
+
+
+  ImportedType importedType;
+  if (auto typedefType = dyn_cast<clang::TypedefType>(resultType.getTypePtr())) {
+    if (isUnavailableInSwift(typedefType->getDecl())) {
+      if (auto clangEnum = findAnonymousEnumForTypedef(SwiftContext, typedefType)) {
+        // If this fails, it means that we need a stronger predicate for
+        // determining the relationship between an enum and typedef.
+        assert(clangEnum.getValue()->getIntegerType()->getCanonicalTypeInternal() ==
+               typedefType->getCanonicalTypeInternal());
+        if (auto swiftEnum = importDecl(*clangEnum, CurrentVersion)) {
+          importedType = {cast<NominalTypeDecl>(swiftEnum)->getDeclaredType(), false};
+        }
+      }
+    }
+  }
+
+  if (!importedType)
+    importedType = importType(resultType, resultKind, addImportDiag,
+                              allowNSUIntegerAsIntInResult, Bridgeability::Full,
+                              getImportTypeAttrs(clangDecl),
+                              OptionalityOfReturn);
 
   // Adjust the result type for a throwing function.
   if (importedType.getType() && errorInfo) {
@@ -2860,7 +2878,21 @@ ImportedType ClangImporter::Implementation::importMethodParamsAndReturnType(
     ImportTypeKind importKind = ImportTypeKind::Parameter;
     ImportDiagnosticAdder paramAddDiag(*this, clangDecl, param->getLocation());
     Type swiftParamTy;
-    bool paramIsIUO;
+    bool paramIsIUO = false;
+    if (auto typedefType = dyn_cast<clang::TypedefType>(paramTy.getTypePtr())) {
+      if (isUnavailableInSwift(typedefType->getDecl())) {
+        if (auto clangEnum = findAnonymousEnumForTypedef(SwiftContext, typedefType)) {
+          // If this fails, it means that we need a stronger predicate for
+          // determining the relationship between an enum and typedef.
+          assert(clangEnum.getValue()->getIntegerType()->getCanonicalTypeInternal() ==
+                 typedefType->getCanonicalTypeInternal());
+          if (auto swiftEnum = importDecl(*clangEnum, CurrentVersion)) {
+            swiftParamTy = cast<NominalTypeDecl>(swiftEnum)->getDeclaredType();
+          }
+        }
+      }
+    }
+
     if (kind == SpecialMethodKind::NSDictionarySubscriptGetter &&
         paramTy->isObjCIdType()) {
       // Not using `getImportTypeAttrs()` is unprincipled but OK for this hack.
@@ -2872,7 +2904,7 @@ ImportedType ClangImporter::Implementation::importMethodParamsAndReturnType(
         swiftParamTy = OptionalType::get(swiftParamTy);
 
       paramIsIUO = optionalityOfParam == OTK_ImplicitlyUnwrappedOptional;
-    } else {
+    } else if (!swiftParamTy) {
       if (param->hasAttr<clang::CFReturnsRetainedAttr>())
         importKind = ImportTypeKind::CFRetainedOutParameter;
       else if (param->hasAttr<clang::CFReturnsNotRetainedAttr>())

test/Interop/Cxx/enum/Inputs/anonymous-with-swift-name.h

@@ -22,4 +22,11 @@ typedef CF_OPTIONS(unsigned, CFColorMask) {
 inline SOColorMask useSOColorMask(SOColorMask mask) { return mask; }
 inline CFColorMask useCFColorMask(CFColorMask mask) { return mask; }
 
+#if __OBJC__
+@interface ColorMaker
+- (void)makeColorWithOptions:(SOColorMask)opts;
+- (void)makeOtherColorWithInt:(int) x withOptions:(CFColorMask)opts;
+@end
+#endif // SWIFT_OBJC_INTEROP
+
 #endif // TEST_INTEROP_CXX_ENUM_INPUTS_ANONYMOUS_WITH_SWIFT_NAME_H

test/Interop/Cxx/enum/anonymous-with-swift-name-objc-module-interface.swift

@@ -0,0 +1,18 @@
+// RUN: %target-swift-ide-test -print-module -module-to-print=AnonymousWithSwiftName -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
+//
+// REQUIRES: objc_interop
+
+// CHECK: class ColorMaker {
+// CHECK:   class func makeColor(withOptions opts: SOColorMask)
+// CHECK:   func makeColor(withOptions opts: SOColorMask)
+// CHECK:   @available(swift, obsoleted: 3, renamed: "makeColor(withOptions:)")
+// CHECK:   class func makeColorWithOptions(_ opts: SOColorMask)
+// CHECK:   @available(swift, obsoleted: 3, renamed: "makeColor(withOptions:)")
+// CHECK:   func makeColorWithOptions(_ opts: SOColorMask)
+// CHECK:   class func makeOtherColor(with x: Int32, withOptions opts: CFColorMask)
+// CHECK:   func makeOtherColor(with x: Int32, withOptions opts: CFColorMask)
+// CHECK:   @available(swift, obsoleted: 3, renamed: "makeOtherColor(with:withOptions:)")
+// CHECK:   class func makeOtherColorWithInt(_ x: Int32, withOptions opts: CFColorMask)
+// CHECK:   @available(swift, obsoleted: 3, renamed: "makeOtherColor(with:withOptions:)")
+// CHECK:   func makeOtherColorWithInt(_ x: Int32, withOptions opts: CFColorMask)
+// CHECK: }