Merge pull request #84881 from egorzhdan/egorzhdan/remove-opt-out-flag

[cxx-interop] Remove opt-out flag for constructors of foreign reference types

Author: egorzhdan

include/swift/Basic/Features.def

@@ -498,10 +498,6 @@ EXPERIMENTAL_FEATURE(AssumeResilientCxxTypes, true)
 /// Import inherited non-public members when importing C++ classes.
 EXPERIMENTAL_FEATURE(ImportNonPublicCxxMembers, true)
 
-/// Suppress the synthesis of static factory methods for C++ foreign reference
-/// types and importing them as Swift initializers.
-EXPERIMENTAL_FEATURE(SuppressCXXForeignReferenceTypeInitializers, true)
-
 /// Emit a warning when a C++ API returns a SWIFT_SHARED_REFERENCE type
 /// without being explicitly annotated with either SWIFT_RETURNS_RETAINED
 /// or SWIFT_RETURNS_UNRETAINED.

lib/AST/FeatureSet.cpp

@@ -332,7 +332,6 @@ UNINTERESTING_FEATURE(LibraryEvolution)
 UNINTERESTING_FEATURE(SafeInteropWrappers)
 UNINTERESTING_FEATURE(AssumeResilientCxxTypes)
 UNINTERESTING_FEATURE(ImportNonPublicCxxMembers)
-UNINTERESTING_FEATURE(SuppressCXXForeignReferenceTypeInitializers)
 UNINTERESTING_FEATURE(WarnUnannotatedReturnOfCxxFrt)
 UNINTERESTING_FEATURE(CoroutineAccessorsUnwindOnCallerError)
 UNINTERESTING_FEATURE(AllowRuntimeSymbolDeclarations)

lib/ClangImporter/ImportDecl.cpp

@@ -2598,34 +2598,30 @@ namespace {
           result->addMember(ctor);
         }
       } else {
-        if (!Impl.SwiftContext.LangOpts.hasFeature(
-                Feature::SuppressCXXForeignReferenceTypeInitializers)) {
-          assert(
-              isa<ClassDecl>(result) &&
-              "Expected result to be a ClassDecl as it cannot be a StructDecl");
-          // When we add full support for C foreign reference types then we
-          // should synthesize static factories for them as well
-          if (auto *cxxRecordDecl = dyn_cast<clang::CXXRecordDecl>(decl)) {
-            bool hasUserProvidedStaticFactory = llvm::any_of(
-                cxxRecordDecl->methods(),
-                [](const clang::CXXMethodDecl *method) {
-                  return method->isStatic() &&
-                         llvm::any_of(
-                             method->specific_attrs<clang::SwiftNameAttr>(),
-                             [](const auto *attr) {
-                               return attr->getName().starts_with("init(");
-                             });
-                });
-            if (!hasUserProvidedStaticFactory) {
-              auto generatedCxxMethodDecls =
-                  synthesizer.synthesizeStaticFactoryForCXXForeignRef(
-                      cxxRecordDecl);
-              for (auto *methodDecl : generatedCxxMethodDecls) {
-                if (Decl *importedInitDecl =
-                        Impl.SwiftContext.getClangModuleLoader()
-                            ->importDeclDirectly(methodDecl))
-                  result->addMember(importedInitDecl);
-              }
+        assert(
+            isa<ClassDecl>(result) &&
+            "Expected result to be a ClassDecl as it cannot be a StructDecl");
+        // When we add full support for C foreign reference types then we
+        // should synthesize static factories for them as well
+        if (auto *cxxRecordDecl = dyn_cast<clang::CXXRecordDecl>(decl)) {
+          bool hasUserProvidedStaticFactory = llvm::any_of(
+              cxxRecordDecl->methods(), [](const clang::CXXMethodDecl *method) {
+                return method->isStatic() &&
+                       llvm::any_of(
+                           method->specific_attrs<clang::SwiftNameAttr>(),
+                           [](const auto *attr) {
+                             return attr->getName().starts_with("init(");
+                           });
+              });
+          if (!hasUserProvidedStaticFactory) {
+            auto generatedCxxMethodDecls =
+                synthesizer.synthesizeStaticFactoryForCXXForeignRef(
+                    cxxRecordDecl);
+            for (auto *methodDecl : generatedCxxMethodDecls) {
+              if (Decl *importedInitDecl =
+                      Impl.SwiftContext.getClangModuleLoader()
+                          ->importDeclDirectly(methodDecl))
+                result->addMember(importedInitDecl);
             }
           }
         }