Merge pull request #68786 from kubamracek/embedded-no-swiftinterface

[embedded] Do not emit .swiftinterface files for fragile modules (embedded stdlib, Cxx.swiftmodule)

Author: kubamracek

stdlib/cmake/modules/SwiftSource.cmake

@@ -646,7 +646,7 @@ function(_compile_swift_files
     set(sibopt_file "${module_base}.O.sib")
     set(sibgen_file "${module_base}.sibgen")
 
-    if(SWIFT_ENABLE_MODULE_INTERFACES)
+    if(SWIFT_ENABLE_MODULE_INTERFACES AND NOT SWIFTFILE_IS_FRAGILE)
       set(interface_file "${module_base}.swiftinterface")
       set(interface_file_static "${module_base_static}.swiftinterface")
       set(private_interface_file "${module_base}.private.swiftinterface")
@@ -705,7 +705,7 @@ function(_compile_swift_files
 
       set(maccatalyst_module_outputs "${maccatalyst_module_file}" "${maccatalyst_module_doc_file}")
 
-      if(SWIFT_ENABLE_MODULE_INTERFACES)
+      if(SWIFT_ENABLE_MODULE_INTERFACES AND NOT SWIFTFILE_IS_FRAGILE)
         set(maccatalyst_interface_file "${maccatalyst_module_base}.swiftinterface")
         set(maccatalyst_private_interface_file "${maccatalyst_module_base}.private.swiftinterface")
         list(APPEND maccatalyst_module_outputs "${maccatalyst_interface_file}" "${maccatalyst_private_interface_file}")

stdlib/public/core/CMakeLists.txt

@@ -424,7 +424,7 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
       embedded-stdlib-${triple}
       swiftCore
       ONLY_SWIFTMODULE
-      IS_STDLIB IS_STDLIB_CORE
+      IS_STDLIB IS_STDLIB_CORE IS_FRAGILE
       ${SWIFTLIB_EMBEDDED_SOURCES}
       GYB_SOURCES ${SWIFTLIB_EMBEDDED_GYB_SOURCES}
       SWIFT_COMPILE_FLAGS -target "${triple}" -Xcc -D__MACH__ -enable-experimental-feature Embedded

validation-test/ParseableInterface/verify_all_overlays.py

@@ -50,6 +50,12 @@
     ]:
         continue
 
+    # Cxx and CxxStdlib are built without library evolution and don't have a
+    # .swiftinterface file
+    if module_name in ["Cxx", "CxxStdlib"]:
+        if not os.path.exists(interface_file):
+            continue
+
     # swift -build-module-from-parseable-interface
     output_path = os.path.join(output_dir, module_name + ".swiftmodule")
     compiler_args = ["-o", output_path, "-module-name", module_name,