[cxx-interop] Add-on commits to previous NS_OPTIONS fix PR

Add-on to address comments from #67036

Addresses some nits, test addons, and some code cleanups/improvement.

(cherry picked from commit 9369908)

Author: plotfi

lib/ClangImporter/ImportDecl.cpp

@@ -818,8 +818,8 @@ static bool isPrintLikeMethod(DeclName name, const DeclContext *dc) {
 using MirroredMethodEntry =
   std::tuple<const clang::ObjCMethodDecl*, ProtocolDecl*, bool /*isAsync*/>;
 
-ImportedType tryImportOptionsTypeForField(const clang::QualType type,
-                                          ClangImporter::Implementation &Impl) {
+ImportedType findOptionSetType(clang::QualType type,
+                               ClangImporter::Implementation &Impl) {
   ImportedType importedType;
   auto fieldType = type;
   if (auto elaborated = dyn_cast<clang::ElaboratedType>(fieldType))
@@ -3676,7 +3676,7 @@ namespace {
       }
 
       auto fieldType = decl->getType();
-      ImportedType importedType = tryImportOptionsTypeForField(fieldType, Impl);
+      ImportedType importedType = findOptionSetType(fieldType, Impl);
 
       if (!importedType)
         importedType =
@@ -5202,7 +5202,7 @@ namespace {
       }
 
       auto fieldType = decl->getType();
-      ImportedType importedType = tryImportOptionsTypeForField(fieldType, Impl);
+      ImportedType importedType = findOptionSetType(fieldType, Impl);
 
       if (!importedType)
         importedType = Impl.importPropertyType(decl, isInSystemModule(dc));

lib/ClangImporter/ImportType.cpp

@@ -3212,8 +3212,8 @@ ImportedType ClangImporter::Implementation::importMethodParamsAndReturnType(
           importedType.isImplicitlyUnwrapped()};
 }
 
-ImportedType tryImportOptionsTypeForField(const clang::QualType type,
-                                          ClangImporter::Implementation &Impl);
+ImportedType findOptionSetType(clang::QualType type,
+                               ClangImporter::Implementation &Impl);
 
 ImportedType ClangImporter::Implementation::importAccessorParamsAndReturnType(
     const DeclContext *dc, const clang::ObjCPropertyDecl *property,
@@ -3238,13 +3238,13 @@ ImportedType ClangImporter::Implementation::importAccessorParamsAndReturnType(
   DeclContext *origDC = importDeclContextOf(property,
                                             property->getDeclContext());
   assert(origDC);
-  auto fieldType = isGetter ? clangDecl->getReturnType() : clangDecl->getParamDecl(0)->getType();
-  ImportedType importedNSOptionsType = tryImportOptionsTypeForField(fieldType, *this);
+  auto fieldType = isGetter ? clangDecl->getReturnType()
+                            : clangDecl->getParamDecl(0)->getType();
 
   // Import the property type, independent of what kind of accessor this is.
-  auto importedType = importPropertyType(property, isFromSystemModule);
-  if (importedNSOptionsType)
-    importedType = importedNSOptionsType;
+  ImportedType importedType = findOptionSetType(fieldType, *this);
+  if (!importedType)
+    importedType = importPropertyType(property, isFromSystemModule);
   if (!importedType)
     return {Type(), false};
 

test/Interop/Cxx/enum/Inputs/c-enums-NS_OPTIONS.h

@@ -86,6 +86,10 @@ struct HasNSOptionField {
 @property Bar bar;
 @end
 
+@interface HasNSOptionFieldObjC2
+- (void)setBar:(Bar)bar;
+@end
+
 Baz CFunctionReturningNSOption();
 void CFunctionTakingNSOption(Baz);
 

test/Interop/Cxx/enum/c-enums-NS_OPTIONS.swift

@@ -31,3 +31,8 @@ import CenumsNSOptions
 // CHECK-NEXT:   class func bar() -> Bar
 // CHECK-NEXT:   class func setBar(_ bar: Bar)
 // CHECK-NEXT: }
+
+// CHECK: class HasNSOptionFieldObjC2 {
+// CHECK-NEXT:   class func setBar(_ bar: Bar)
+// CHECK-NEXT:   func setBar(_ bar: Bar)
+// CHECK-NEXT: }