[gradle] Use more fine grained directory for K/N incremental compilation

Otherwise, two or more link tasks being executed in parallel will use the same directory for IC caches which might lead to races during compilation #KT-63471 Fixed
JetBrains · Dec 18, 2023 · 9c7aac2 · 9c7aac2
1 parent 9012e67
commit 9c7aac2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...ests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeIncrementalCompilationIT.kt b/...ests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeIncrementalCompilationIT.kt
@@ -40,9 +40,10 @@ class NativeIncrementalCompilationIT : KGPBaseTest() {
                 "-Xbackend-threads=4"
             )
 
+            val icCacheDir = projectPath.resolve("build").resolve("kotlin-native-ic-cache").resolve("debugExecutable")
             val incrementalCacheArgs = arrayOf(
                 "-Xenable-incremental-compilation",
-                "-Xic-cache-dir=${projectPath.resolve("build").resolve("kotlin-native-ic-cache").toFile().canonicalPath}"
+                "-Xic-cache-dir=${icCacheDir.toFile().canonicalPath}"
             )
 
             val withoutIncrementalCacheBuildOptions = defaultBuildOptions.copy(

diff --git a/...in/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt b/...in/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt
@@ -379,7 +379,9 @@ constructor(
                             add("-Xauto-cache-from=${cacheSettings.gradleUserHomeDir}")
                             add("-Xbackend-threads=${cacheSettings.threads}")
                             if (cacheSettings.icEnabled) {
-                                val icCacheDir = cacheSettings.gradleBuildDir.resolve("kotlin-native-ic-cache")
+                                val icCacheDir = cacheSettings.gradleBuildDir
+                                    .resolve("kotlin-native-ic-cache")
+                                    .resolve(binaryName)
                                 icCacheDir.mkdirs()
                                 add("-Xenable-incremental-compilation")
                                 add("-Xic-cache-dir=$icCacheDir")