From b684c2f8d784ed9e2f67e7f1f7b560ebaf0145c2 Mon Sep 17 00:00:00 2001
From: Anton Bannykh <anton.bannykh@jetbrains.com>
Date: Wed, 10 Nov 2021 16:36:56 +0300
Subject: [PATCH] Revert "JS IR gradle plugin: don't run IC for the main
 module"

This reverts commit 525c5b886faa11eade6892027f59ce1e681c3fd5.
---
 .../gradle/targets/js/ir/KotlinJsIrLink.kt    | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt
index 76c6a57c151..f0ee6630c34 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt
@@ -117,7 +117,6 @@ abstract class KotlinJsIrLink @Inject constructor(
 
             val cacheBuilder = CacheBuilder(
                 buildDir,
-                compilation as KotlinCompilation<*>,
                 kotlinOptions,
                 libraryFilter,
                 compilerRunner.get(),
@@ -164,7 +163,6 @@ abstract class KotlinJsIrLink @Inject constructor(
             .buildCompilerArgs(
                 project.configurations.getByName(compilation.compileDependencyConfigurationName),
                 compilation.output.classesDirs,
-                compilation,
                 associatedCaches
             )
     }
@@ -194,7 +192,6 @@ abstract class KotlinJsIrLink @Inject constructor(
 
 internal class CacheBuilder(
     private val buildDir: File,
-    private val rootCompilation: KotlinCompilation<*>,
     private val kotlinOptions: KotlinJsOptions,
     private val libraryFilter: (File) -> Boolean,
     private val compilerRunner: GradleCompilerRunner,
@@ -218,7 +215,6 @@ internal class CacheBuilder(
     fun buildCompilerArgs(
         compileClasspath: Configuration,
         additionalForResolve: FileCollection?,
-        compilation: KotlinCompilation<*>,
         associatedCaches: List<File>
     ): List<File> {
 
@@ -243,18 +239,16 @@ internal class CacheBuilder(
                 }
             }
 
-        if (compilation != rootCompilation) {
-            additionalForResolve?.files?.forEach { file ->
-                val cacheDirectory = rootCacheDirectory.resolve(file.name)
-                cacheDirectory.mkdirs()
-                runCompiler(
-                    file,
-                    compileClasspath.files,
-                    cacheDirectory,
-                    (allCacheDirectories + associatedCaches).distinct()
-                )
-                allCacheDirectories.add(cacheDirectory)
-            }
+        additionalForResolve?.files?.forEach { file ->
+            val cacheDirectory = rootCacheDirectory.resolve(file.name)
+            cacheDirectory.mkdirs()
+            runCompiler(
+                file,
+                compileClasspath.files,
+                cacheDirectory,
+                (allCacheDirectories + associatedCaches).distinct()
+            )
+            allCacheDirectories.add(cacheDirectory)
         }
 
         return associatedCaches + allCacheDirectories