[Gradle] Don't convert free compiler arguments to set, avoid args duplication

#KT-55363 Fixed

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CompilerOptionsIT.kt

@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.gradle
 import org.gradle.api.logging.LogLevel
 import org.gradle.util.GradleVersion
 import org.jetbrains.kotlin.gradle.testbase.*
-import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.DisplayName
 import kotlin.io.path.appendText
 
@@ -62,7 +61,6 @@ internal class CompilerOptionsIT : KGPBaseTest() {
     @DisplayName("compiler plugin arguments set via kotlinOptions.freeCompilerArgs on task execution applied properly")
     @JvmGradlePluginTests
     @GradleTest
-    @Disabled
     internal fun freeArgsModifiedAtExecutionTimeCorrectly(gradleVersion: GradleVersion) {
         project("simpleProject", gradleVersion) {
             buildGradle.appendText(
@@ -95,7 +93,6 @@ internal class CompilerOptionsIT : KGPBaseTest() {
     @DisplayName("compiler plugin arguments set via kotlinOptions.freeCompilerArgs on task execution applied properly in MPP")
     @MppGradlePluginTests
     @GradleTest
-    @Disabled
     internal fun freeArgsModifiedAtExecutionTimeCorrectlyMpp(gradleVersion: GradleVersion) {
         project("new-mpp-lib-with-tests", gradleVersion) {
             buildGradle.appendText(

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt

@@ -61,7 +61,7 @@ abstract class KotlinCompileCommon @Inject constructor(
      * this input will always be empty.
      */
     @get:Internal
-    internal var additionalFreeCompilerArgs: List<String> = listOf()
+    internal var executionTimeFreeCompilerArgs: List<String>? = null
 
     override fun createCompilerArgs(): K2MetadataCompilerArguments =
         K2MetadataCompilerArguments()
@@ -90,8 +90,9 @@ abstract class KotlinCompileCommon @Inject constructor(
 
         (compilerOptions as KotlinMultiplatformCommonCompilerOptionsDefault).fillCompilerArguments(args)
 
-        if (additionalFreeCompilerArgs.isNotEmpty()) {
+        val localExecutionTimeFreeCompilerArgs = executionTimeFreeCompilerArgs
-            args.freeArgs = compilerOptions.freeCompilerArgs.get().union(additionalFreeCompilerArgs).toList()
+        if (localExecutionTimeFreeCompilerArgs != null) {
+            args.freeArgs = localExecutionTimeFreeCompilerArgs
         }
     }
 

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt

@@ -701,7 +701,7 @@ abstract class KotlinCompile @Inject constructor(
      * this input will always be empty.
      */
     @get:Internal
-    internal var additionalFreeCompilerArgs: List<String> = listOf()
+    internal var executionTimeFreeCompilerArgs: List<String>? = null
 
     override fun setupCompilerArgs(args: K2JVMCompilerArguments, defaultsOnly: Boolean, ignoreClasspathResolutionErrors: Boolean) {
         compilerArgumentsContributor.contributeArguments(
@@ -715,8 +715,9 @@ abstract class KotlinCompile @Inject constructor(
             args.reportPerf = true
         }
 
-        if (additionalFreeCompilerArgs.isNotEmpty()) {
+        val localExecutionTimeFreeCompilerArgs = executionTimeFreeCompilerArgs
-            args.freeArgs = compilerOptions.freeCompilerArgs.get().union(additionalFreeCompilerArgs).toList()
+        if (localExecutionTimeFreeCompilerArgs != null) {
+            args.freeArgs = localExecutionTimeFreeCompilerArgs
         }
     }
 
@@ -1009,7 +1010,7 @@ abstract class Kotlin2JsCompile @Inject constructor(
      * this input will always be empty.
      */
     @get:Internal
-    internal var additionalFreeCompilerArgs: List<String> = listOf()
+    internal var executionTimeFreeCompilerArgs: List<String>? = null
 
     override fun createCompilerArgs(): K2JSCompilerArguments =
         K2JSCompilerArguments()
@@ -1039,7 +1040,8 @@ abstract class Kotlin2JsCompile @Inject constructor(
         }
         // Overriding freeArgs from compilerOptions with enhanced one + additional one set on execution phase
         // containing additional arguments based on the js compilation configuration
-        args.freeArgs = enhancedFreeCompilerArgs.get().union(additionalFreeCompilerArgs).toList()
+        val localExecutionTimeFreeCompilerArgs = executionTimeFreeCompilerArgs
+        args.freeArgs = if (localExecutionTimeFreeCompilerArgs != null) localExecutionTimeFreeCompilerArgs else enhancedFreeCompilerArgs.get()
     }
 
     @get:InputFiles

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/internal/KotlinJsOptionsCompat.kt

@@ -18,17 +18,21 @@ class KotlinJsOptionsCompat(
     override val options: KotlinJsCompilerOptions
 ) : KotlinJsOptions {
     override var freeCompilerArgs: List<String>
-        get() = if (isTaskExecuting) {
+        get() {
-            task().enhancedFreeCompilerArgs.get()
+            val executionTimeFreeCompilerArgs = task().executionTimeFreeCompilerArgs
-                .union(task().additionalFreeCompilerArgs)
+            return if (!isTaskExecuting) {
-                .toList()
+                options.freeCompilerArgs.get()
-        } else {
+            } else if (executionTimeFreeCompilerArgs != null) {
-            options.freeCompilerArgs.get()
+                executionTimeFreeCompilerArgs
+            } else {
+                // returned at execution time before freeCompilerArgs modification
+                task().enhancedFreeCompilerArgs.get()
+            }
         }
 
         set(value) = if (isTaskExecuting) {
             task().nagUserFreeArgsModifiedOnExecution(value)
-            task().additionalFreeCompilerArgs = value
+            task().executionTimeFreeCompilerArgs = value
         } else {
             options.freeCompilerArgs.set(value)
         }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/internal/KotlinJvmOptionsCompat.kt

@@ -18,15 +18,18 @@ class KotlinJvmOptionsCompat(
     override val options: KotlinJvmCompilerOptions
 ) : KotlinJvmOptions {
     override var freeCompilerArgs: List<String>
-        get() = if (isTaskExecuting) {
+        get() {
-            options.freeCompilerArgs.get().union(task().additionalFreeCompilerArgs).toList()
+            val executionTimeFreeCompilerArgs = task().executionTimeFreeCompilerArgs
-        } else {
+            return if (isTaskExecuting && executionTimeFreeCompilerArgs != null) {
-            options.freeCompilerArgs.get()
+                executionTimeFreeCompilerArgs
+            } else {
+                options.freeCompilerArgs.get()
+            }
         }
 
         set(value) = if (isTaskExecuting) {
             task().nagUserFreeArgsModifiedOnExecution(value)
-            task().additionalFreeCompilerArgs = value
+            task().executionTimeFreeCompilerArgs = value
         } else {
             options.freeCompilerArgs.set(value)
         }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/internal/KotlinMultiplatformCommonOptionsCompat.kt

@@ -15,17 +15,18 @@ class KotlinMultiplatformCommonOptionsCompat(
 ) : KotlinMultiplatformCommonOptions {
 
     override var freeCompilerArgs: List<String>
-        get() = if (isTaskExecuting) {
+        get() {
-            options.freeCompilerArgs.get()
+            val executionTimeFreeCompilerArgs = task().executionTimeFreeCompilerArgs
-                .union(task().additionalFreeCompilerArgs)
+            return if (isTaskExecuting && executionTimeFreeCompilerArgs != null) {
-                .toList()
+                executionTimeFreeCompilerArgs
-        } else {
+            } else {
-            options.freeCompilerArgs.get()
+                options.freeCompilerArgs.get()
+            }
         }
 
         set(value) = if (isTaskExecuting) {
             task().nagUserFreeArgsModifiedOnExecution(value)
-            task().additionalFreeCompilerArgs = value
+            task().executionTimeFreeCompilerArgs = value
         } else {
             options.freeCompilerArgs.set(value)
         }