From 5ec73d6fbd85507e776eac762046bb718a450a1f Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Thu, 12 Oct 2017 19:46:18 +0300
Subject: [PATCH] Misc: Protect freeArgs with FreezableVar

Original commit: 87f3d24f9bb6364c465b57a47fe4e1d9c6a74005
---
 .../src/org/jetbrains/kotlin/config/facetSerialization.kt       | 1 +
 .../org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt | 2 +-
 .../kotlin/jps/incremental/AbstractJsProtoComparisonTest.kt     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
index 2b8938ea570..8551ed971f8 100644
--- a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
+++ b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
@@ -59,6 +59,7 @@ private fun readV1Config(element: Element): KotlinFacetSettings {
         val jsArgumentsElement = compilerInfoElement?.getOptionBody("k2jsCompilerArguments")
 
         val compilerArguments = targetPlatform.createCompilerArguments()
+        compilerArguments.freeArgs = ArrayList()
 
         commonArgumentsElement?.let { XmlSerializer.deserializeInto(compilerArguments, it) }
         when (compilerArguments) {
diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
index 65b22374dee..c281bc1346e 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
@@ -138,7 +138,7 @@ abstract class AbstractJsLookupTrackerTest : AbstractLookupTrackerTest() {
         val args = K2JSCompilerArguments().apply {
             outputFile = File(outDir, "out.js").canonicalPath
             reportOutputFiles = true
-            freeArgs.addAll(filesToCompile.map { it.canonicalPath })
+            freeArgs = filesToCompile.map { it.canonicalPath }
         }
         return runJSCompiler(args, env)
     }
diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJsProtoComparisonTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJsProtoComparisonTest.kt
index 0d501069908..bbf76b06404 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJsProtoComparisonTest.kt
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJsProtoComparisonTest.kt
@@ -56,7 +56,7 @@ abstract class AbstractJsProtoComparisonTest : AbstractProtoComparisonTest<Proto
             outputFile = File(outputDir, "out.js").canonicalPath
             metaInfo = true
             main = K2JsArgumentConstants.NO_CALL
-            freeArgs.addAll(ktFiles)
+            freeArgs = ktFiles
         }
 
         val env = createTestingCompilerEnvironment(messageCollector, outputItemsCollector, services)