Fix a crash caused by SKIE generating invalid modulemap if no Swift c…

…ode generated was generated.

SKIE/kotlin-compiler/core/src/commonMain/kotlin/co/touchlab/skie/phases/other/GenerateModulemapFilePhase.kt

@@ -37,7 +37,7 @@ sealed class GenerateModulemapFilePhase(private val generateSwiftModule: Boolean
 
             appendLine("}")
 
-            if (generateSwiftModule) {
+            if (generateSwiftModule && framework.swiftHeader.exists()) {
                 appendLine()
                 appendLine("module ${framework.moduleName}.Swift {")
                 appendLine("    header \"${framework.swiftHeader.name}\"")

SKIE/kotlin-compiler/core/src/commonMain/kotlin/co/touchlab/skie/phases/swift/CompileSwiftPhase.kt

@@ -22,15 +22,15 @@ class CompileSwiftPhase(
     private val outputFileMap = context.skieBuildDirectory.swiftCompiler.config.outputFileMap
     private val objectFiles = skieBuildDirectory.swiftCompiler.objectFiles
     private val moduleDirectory = skieBuildDirectory.swiftCompiler.module
-    private val targetTriple = swiftCompilerConfiguration.targetTriple
 
     private val isLibraryEvolutionEnabled = SkieConfigurationFlag.Build_SwiftLibraryEvolution in rootConfiguration.enabledFlags
     private val isParallelSwiftCompilationEnabled = SkieConfigurationFlag.Build_ParallelSwiftCompilation in rootConfiguration.enabledFlags
     private val isConcurrentSkieCompilationEnabled = SkieConfigurationFlag.Build_ConcurrentSkieCompilation in rootConfiguration.enabledFlags
 
     context(SirPhase.Context)
     override suspend fun execute() {
-        val sourceFiles = sirProvider.skieModuleFiles.filterIsInstance<SirCompilableFile>().map { it.absolutePath.toFile() }
+        val sourceFiles = sirProvider.compilableFiles.map { it.absolutePath.toFile() }
+
         if (sourceFiles.isEmpty()) {
             return
         }
@@ -42,10 +42,6 @@ class CompileSwiftPhase(
         callSwiftCompiler()
 
         deleteOldObjectFiles(sourceFiles)
-
-        copySwiftModuleFiles()
-
-        copySwiftLibraryEvolutionFiles()
     }
 
     private fun createSwiftFileList(sourceFiles: List<File>) {
@@ -169,31 +165,6 @@ class CompileSwiftPhase(
             SwiftCompilerConfiguration.BitcodeEmbeddingMode.Full -> "-embed-bitcode"
         }
 
-    private fun copySwiftModuleFiles() {
-        val copyFiles = mapOf(
-            swiftFrameworkHeader.swiftModule to framework.swiftModule(targetTriple),
-            swiftFrameworkHeader.swiftDoc to framework.swiftDoc(targetTriple),
-            swiftFrameworkHeader.abiJson to framework.abiJson(targetTriple),
-            swiftFrameworkHeader.swiftSourceInfo to framework.swiftSourceInfo(targetTriple),
-            swiftFrameworkHeader.swiftHeader to framework.swiftHeader,
-        )
-
-        copyFiles.forEach { (source, target) ->
-            source.copyTo(target, overwrite = true)
-        }
-    }
-
-    private fun copySwiftLibraryEvolutionFiles() {
-        if (isLibraryEvolutionEnabled) {
-            swiftFrameworkHeader.swiftInterface.copyTo(framework.swiftInterface(targetTriple), overwrite = true)
-            swiftFrameworkHeader.privateSwiftInterface.copyTo(framework.privateSwiftInterface(targetTriple), overwrite = true)
-        } else {
-            // WIP Check what happens with swiftFrameworkHeader
-            framework.swiftInterface(targetTriple).delete()
-            framework.privateSwiftInterface(targetTriple).delete()
-        }
-    }
-
     private val parallelizationArgument: String
         get() {
             val numberOfAvailableProcessors = if (isParallelSwiftCompilationEnabled) {

SKIE/kotlin-compiler/core/src/commonMain/kotlin/co/touchlab/skie/phases/swift/CopySwiftOutputFilesToFrameworkPhase.kt

@@ -0,0 +1,58 @@
+package co.touchlab.skie.phases.swift
+
+import co.touchlab.skie.configuration.SkieConfigurationFlag
+import co.touchlab.skie.phases.SirPhase
+
+class CopySwiftOutputFilesToFrameworkPhase(
+    context: SirPhase.Context,
+) : SirPhase {
+
+    private val framework = context.framework
+    private val swiftFrameworkHeader = context.skieBuildDirectory.swiftCompiler.moduleHeader(framework.moduleName)
+    private val targetTriple = context.swiftCompilerConfiguration.targetTriple
+
+    context(SirPhase.Context)
+    override suspend fun execute() {
+        if (sirProvider.compilableFiles.isNotEmpty()) {
+            copySwiftModuleFiles()
+            copySwiftLibraryEvolutionFiles()
+        } else {
+            deleteSwiftModuleFiles()
+            deleteSwiftLibraryEvolutionFiles()
+        }
+    }
+
+    private fun copySwiftModuleFiles() {
+        val copyFiles = mapOf(
+            swiftFrameworkHeader.swiftModule to framework.swiftModule(targetTriple),
+            swiftFrameworkHeader.swiftDoc to framework.swiftDoc(targetTriple),
+            swiftFrameworkHeader.abiJson to framework.abiJson(targetTriple),
+            swiftFrameworkHeader.swiftSourceInfo to framework.swiftSourceInfo(targetTriple),
+            swiftFrameworkHeader.swiftHeader to framework.swiftHeader,
+        )
+
+        copyFiles.forEach { (source, target) ->
+            source.copyTo(target, overwrite = true)
+        }
+    }
+
+    private fun deleteSwiftModuleFiles() {
+        framework.swiftModuleParent.deleteRecursively()
+        framework.swiftHeader.delete()
+    }
+
+    context(SirPhase.Context)
+    private fun copySwiftLibraryEvolutionFiles() {
+        if (SkieConfigurationFlag.Build_SwiftLibraryEvolution.isEnabled) {
+            swiftFrameworkHeader.swiftInterface.copyTo(framework.swiftInterface(targetTriple), overwrite = true)
+            swiftFrameworkHeader.privateSwiftInterface.copyTo(framework.privateSwiftInterface(targetTriple), overwrite = true)
+        } else {
+            deleteSwiftLibraryEvolutionFiles()
+        }
+    }
+
+    private fun deleteSwiftLibraryEvolutionFiles() {
+        framework.swiftInterface(targetTriple).delete()
+        framework.privateSwiftInterface(targetTriple).delete()
+    }
+}

SKIE/kotlin-compiler/core/src/commonMain/kotlin/co/touchlab/skie/sir/SirProvider.kt

@@ -9,6 +9,7 @@ import co.touchlab.skie.phases.SirPhase
 import co.touchlab.skie.sir.builtin.SirBuiltins
 import co.touchlab.skie.sir.element.SirCallableDeclaration
 import co.touchlab.skie.sir.element.SirClass
+import co.touchlab.skie.sir.element.SirCompilableFile
 import co.touchlab.skie.sir.element.SirDeclaration
 import co.touchlab.skie.sir.element.SirDeclarationParent
 import co.touchlab.skie.sir.element.SirExtension
@@ -48,6 +49,9 @@ class SirProvider(
     val skieModuleFiles: Collection<SirFile>
         get() = skieModule.files
 
+    val compilableFiles: List<SirCompilableFile>
+        get() = skieModuleFiles.filterIsInstance<SirCompilableFile>()
+
     val allLocalDeclarations: List<SirDeclaration>
         get() = listOf(skieModule, kotlinModule).flatMap { it.getAllDeclarationsRecursively() }
 

SKIE/kotlin-compiler/linker-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/LinkerPhaseScheduler.kt

@@ -78,6 +78,7 @@ import co.touchlab.skie.phases.sir.type.InitializeSirSuperTypesPhase
 import co.touchlab.skie.phases.swift.CompileSwiftPhase
 import co.touchlab.skie.phases.swift.ConvertSirIrFilesToSourceFilesPhase
 import co.touchlab.skie.phases.swift.ConvertSirSourceFilesToCompilableFilesPhase
+import co.touchlab.skie.phases.swift.CopySwiftOutputFilesToFrameworkPhase
 import co.touchlab.skie.phases.swift.SwiftKotlinFrameworkCacheSetupPhase
 import co.touchlab.skie.phases.typeconflicts.RenameTypesConflictingWithKeywordsPhase
 import co.touchlab.skie.phases.typeconflicts.RenameTypesConflictingWithKotlinModulePhase
@@ -241,6 +242,7 @@ class LinkerPhaseScheduler : SkiePhaseScheduler {
             SwiftKotlinFrameworkCacheSetupPhase,
             ImportFakeObjCDependenciesPhase.RevertPhase,
             CompileSwiftPhase(context),
+            CopySwiftOutputFilesToFrameworkPhase(context),
             TemporarilyRenameTypesConflictingWithExternalModulesPhase.RevertPhase,
             GenerateModulemapFilePhase.ForFramework,
             ApiNotesGenerationPhase.ForFramework,