Add preview support for 1.9.20.

touchlab · Oct 24, 2023 · 23fe6f5 · 23fe6f5
1 parent 4fb232c
commit 23fe6f5
Show file tree

Hide file tree

Showing 58 changed files with 569 additions and 176 deletions.
diff --git a/SKIE/.run/1.9.20_Tests_Acceptance_All.run.xml b/SKIE/.run/1.9.20_Tests_Acceptance_All.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="1.9.20/Tests/Acceptance/All" type="GradleRunConfiguration" factoryName="Gradle" folderName="1.9.20">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value=":acceptance-tests:functional__kgp_1.9.20Test" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/SKIE/.run/1.9.20_Tests_Acceptance_Failed.run.xml b/SKIE/.run/1.9.20_Tests_Acceptance_Failed.run.xml
@@ -0,0 +1,29 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="1.9.20/Tests/Acceptance/Failed" type="GradleRunConfiguration" factoryName="Gradle" folderName="1.9.20">
+    <ExternalSystemSettings>
+      <option name="env">
+        <map>
+          <entry key="failedOnly" value="" />
+        </map>
+      </option>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value=":acceptance-tests:functional__kgp_1.9.20Test" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/SKIE/.run/1.9.20_Tests_Acceptance_Selected.run.xml b/SKIE/.run/1.9.20_Tests_Acceptance_Selected.run.xml
@@ -0,0 +1,29 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="1.9.20/Tests/Acceptance/Selected" type="GradleRunConfiguration" factoryName="Gradle" folderName="1.9.20">
+    <ExternalSystemSettings>
+      <option name="env">
+        <map>
+          <entry key="acceptanceTest" value="enums/interactions/suspend" />
+        </map>
+      </option>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value=":acceptance-tests:functional__kgp_1.9.20Test" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/SKIE/.run/1.9.20_Tests_Libraries_All.run.xml b/SKIE/.run/1.9.20_Tests_Libraries_All.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="1.9.20/Tests/Libraries/All" type="GradleRunConfiguration" factoryName="Gradle" folderName="1.9.20">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/acceptance-tests" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="libraries__kgp_1.9.20Test" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/SKIE/.run/1.9.20_Tests_Libraries_Compare.run.xml b/SKIE/.run/1.9.20_Tests_Libraries_Compare.run.xml
@@ -0,0 +1,26 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="1.9.20/Tests/Libraries/Compare" type="GradleRunConfiguration" factoryName="Gradle" folderName="1.9.20">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/acceptance-tests" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="pure__kgp_1.9.20Test" />
+          <option value="libraries__kgp_1.9.20Test" />
+          <option value="comparePureAndSkie__kgp_1.9.20" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/SKIE/.run/1.9.20_Tests_Libraries_Failed.run.xml b/SKIE/.run/1.9.20_Tests_Libraries_Failed.run.xml
@@ -0,0 +1,29 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="1.9.20/Tests/Libraries/Failed" type="GradleRunConfiguration" factoryName="Gradle" folderName="1.9.20">
+    <ExternalSystemSettings>
+      <option name="env">
+        <map>
+          <entry key="failedOnly" value="" />
+        </map>
+      </option>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/acceptance-tests" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="libraries__kgp_1.9.20Test" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/SKIE/.run/1.9.20_Tests_Libraries_Selected Library.run.xml b/SKIE/.run/1.9.20_Tests_Libraries_Selected Library.run.xml
@@ -0,0 +1,30 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="1.9.20/Tests/Libraries/Selected Library" type="GradleRunConfiguration" factoryName="Gradle" folderName="1.9.20">
+    <ExternalSystemSettings>
+      <option name="env">
+        <map>
+          <entry key="libraryTest" value="" />
+          <entry key="onlyIndices" value="1000-1500" />
+        </map>
+      </option>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/acceptance-tests" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="libraries__kgp_1.9.20Test" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/SKIE/.run/1.9.20_Tests_Libraries_Stdlib.run.xml b/SKIE/.run/1.9.20_Tests_Libraries_Stdlib.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="1.9.20/Tests/Libraries/Stdlib" type="GradleRunConfiguration" factoryName="Gradle" folderName="1.9.20">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/acceptance-tests" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="stdlib__kgp_1.9.20Test" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/SKIE/.run/1.9.20_Tests_Libraries_Without SKIE.run.xml b/SKIE/.run/1.9.20_Tests_Libraries_Without SKIE.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="1.9.20/Tests/Libraries/Without SKIE" type="GradleRunConfiguration" factoryName="Gradle" folderName="1.9.20">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/acceptance-tests" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="pure__kgp_1.9.20Test" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/SKIE/.run/1.9.20_Tests_Types_All.run.xml b/SKIE/.run/1.9.20_Tests_Types_All.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="1.9.20/Tests/Types/All" type="GradleRunConfiguration" factoryName="Gradle" folderName="1.9.20">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value=":acceptance-tests:type-mapping__kgp_1.9.20Test" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/SKIE/acceptance-tests b/SKIE/acceptance-tests
diff --git a/...0..1.9.0/kotlin/co/touchlab/skie/kir/util/SymbolTableDescriptorExtensionShim.kgp_1.9.0.kt b/...0..1.9.0/kotlin/co/touchlab/skie/kir/util/SymbolTableDescriptorExtensionShim.kgp_1.9.0.kt
@@ -0,0 +1,36 @@
+package co.touchlab.skie.kir.util
+
+import org.jetbrains.kotlin.descriptors.CallableDescriptor
+import org.jetbrains.kotlin.descriptors.ClassConstructorDescriptor
+import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.descriptors.FunctionDescriptor
+import org.jetbrains.kotlin.descriptors.PropertyDescriptor
+import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
+import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
+import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol
+import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol
+import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol
+import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
+import org.jetbrains.kotlin.ir.util.ReferenceSymbolTable
+import org.jetbrains.kotlin.ir.util.referenceFunction
+
+@OptIn(ObsoleteDescriptorBasedAPI::class)
+actual class SymbolTableDescriptorExtensionShim actual constructor(
+    private val symbolTable: ReferenceSymbolTable
+) {
+
+    actual fun referenceFunction(callable: CallableDescriptor): IrFunctionSymbol =
+        symbolTable.referenceFunction(callable)
+
+    actual fun referenceProperty(descriptor: PropertyDescriptor): IrPropertySymbol =
+        symbolTable.referenceProperty(descriptor)
+
+    actual fun referenceSimpleFunction(descriptor: FunctionDescriptor): IrSimpleFunctionSymbol =
+        symbolTable.referenceSimpleFunction(descriptor)
+
+    actual fun referenceConstructor(descriptor: ClassConstructorDescriptor): IrConstructorSymbol =
+        symbolTable.referenceConstructor(descriptor)
+
+    actual fun referenceClass(descriptor: ClassDescriptor): IrClassSymbol =
+        symbolTable.referenceClass(descriptor)
+}
diff --git a/...ie/phases/analytics/compiler/specific/SpecificCompilerConfigurationAnalytics.kgp_1.8.0.kt b/...ie/phases/analytics/compiler/specific/SpecificCompilerConfigurationAnalytics.kgp_1.8.0.kt
@@ -1,5 +1,17 @@
 package co.touchlab.skie.phases.analytics.compiler.specific
 
+import co.touchlab.skie.phases.analytics.util.toPrettyJson
+import kotlinx.serialization.Serializable
 import org.jetbrains.kotlin.backend.konan.KonanConfig
+import org.jetbrains.kotlin.backend.konan.KonanConfigKeys
+
+actual fun KonanConfig.getSpecificCompilerConfigurationAnalytics(): String =
+    AnalyticsData(
+        garbageCollector = configuration.get(KonanConfigKeys.GARBAGE_COLLECTOR)?.toString(),
+    ).toPrettyJson()
+
+@Serializable
+private data class AnalyticsData(
+    val garbageCollector: String?,
+)
 
-actual fun KonanConfig.getSpecificCompilerConfigurationAnalytics(): String = "{}"
diff --git a/...mpilerConfigurationAnalytics.kgp_1.9.0.kt → ...pilerConfigurationAnalytics.kgp_1.8.20.kt b/...mpilerConfigurationAnalytics.kgp_1.9.0.kt → ...pilerConfigurationAnalytics.kgp_1.8.20.kt
@@ -4,13 +4,16 @@ import co.touchlab.skie.phases.analytics.util.toPrettyJson
 import kotlinx.serialization.Serializable
 import org.jetbrains.kotlin.backend.konan.BinaryOptions
 import org.jetbrains.kotlin.backend.konan.KonanConfig
+import org.jetbrains.kotlin.backend.konan.KonanConfigKeys
 
 actual fun KonanConfig.getSpecificCompilerConfigurationAnalytics(): String =
     AnalyticsData(
         objcExportDisableSwiftMemberNameMangling = configuration.get(BinaryOptions.objcExportDisableSwiftMemberNameMangling),
+        garbageCollector = configuration.get(KonanConfigKeys.GARBAGE_COLLECTOR)?.toString(),
     ).toPrettyJson()
 
 @Serializable
 private data class AnalyticsData(
     val objcExportDisableSwiftMemberNameMangling: Boolean?,
+    val garbageCollector: String?,
 )
diff --git a/...uceObjCExportInterfacePhaseInterceptor.kt → ...uceObjCExportInterfacePhaseInterceptor.kt b/...uceObjCExportInterfacePhaseInterceptor.kt → ...uceObjCExportInterfacePhaseInterceptor.kt
diff --git a/...d/konan/objcexport/ObjCNoneExportScope.kt → ...d/konan/objcexport/ObjCNoneExportScope.kt b/...d/konan/objcexport/ObjCNoneExportScope.kt → ...d/konan/objcexport/ObjCNoneExportScope.kt
diff --git a/...ameTypeNamedPhaseInterceptorConfigurer.kt → ...ameTypeNamedPhaseInterceptorConfigurer.kt b/...ameTypeNamedPhaseInterceptorConfigurer.kt → ...ameTypeNamedPhaseInterceptorConfigurer.kt
diff --git a/.../SimpleNamedPhaseInterceptorConfigurer.kt → .../SimpleNamedPhaseInterceptorConfigurer.kt b/.../SimpleNamedPhaseInterceptorConfigurer.kt → .../SimpleNamedPhaseInterceptorConfigurer.kt
diff --git a/.../phaseInterceptorConfigurers.kgp_1.9.0.kt → .../phaseInterceptorConfigurers.kgp_1.9.0.kt b/.../phaseInterceptorConfigurers.kgp_1.9.0.kt → .../phaseInterceptorConfigurers.kgp_1.9.0.kt
diff --git a/...s/UserVisibleIrModulesSupportReflector.kt → ...s/UserVisibleIrModulesSupportReflector.kt b/...s/UserVisibleIrModulesSupportReflector.kt → ...s/UserVisibleIrModulesSupportReflector.kt
diff --git a/...portCodeSpecPhaseInterceptor.kgp_1.9.0.kt → ...portCodeSpecPhaseInterceptor.kgp_1.9.0.kt b/...portCodeSpecPhaseInterceptor.kgp_1.9.0.kt → ...portCodeSpecPhaseInterceptor.kgp_1.9.0.kt
diff --git a/...skie/entrypoint/LinkerPhaseInterceptor.kt → ...skie/entrypoint/LinkerPhaseInterceptor.kt b/...skie/entrypoint/LinkerPhaseInterceptor.kt → ...skie/entrypoint/LinkerPhaseInterceptor.kt
diff --git a/...ltable/DummyIrSimpleFunction.kgp_1.9.0.kt → ...ltable/DummyIrSimpleFunction.kgp_1.9.0.kt b/...ltable/DummyIrSimpleFunction.kgp_1.9.0.kt → ...ltable/DummyIrSimpleFunction.kgp_1.9.0.kt
diff --git a/...mpilerinject.interceptor.PhaseInterceptor → ...mpilerinject.interceptor.PhaseInterceptor b/...mpilerinject.interceptor.PhaseInterceptor → ...mpilerinject.interceptor.PhaseInterceptor
diff --git a/..._1.9.20/kotlin/co/touchlab/skie/kir/util/SymbolTableDescriptorExtensionShim.kgp_1.9.20.kt b/..._1.9.20/kotlin/co/touchlab/skie/kir/util/SymbolTableDescriptorExtensionShim.kgp_1.9.20.kt
@@ -0,0 +1,36 @@
+package co.touchlab.skie.kir.util
+
+import org.jetbrains.kotlin.descriptors.CallableDescriptor
+import org.jetbrains.kotlin.descriptors.ClassConstructorDescriptor
+import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.descriptors.FunctionDescriptor
+import org.jetbrains.kotlin.descriptors.PropertyDescriptor
+import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
+import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
+import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol
+import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol
+import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol
+import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
+import org.jetbrains.kotlin.ir.util.ReferenceSymbolTable
+import org.jetbrains.kotlin.ir.util.referenceFunction
+
+@OptIn(ObsoleteDescriptorBasedAPI::class)
+actual class SymbolTableDescriptorExtensionShim actual constructor(
+    private val symbolTable: ReferenceSymbolTable
+) {
+
+    actual fun referenceFunction(callable: CallableDescriptor): IrFunctionSymbol =
+        symbolTable.referenceFunction(callable)
+
+    actual fun referenceProperty(descriptor: PropertyDescriptor): IrPropertySymbol =
+        symbolTable.descriptorExtension.referenceProperty(descriptor)
+
+    actual fun referenceSimpleFunction(descriptor: FunctionDescriptor): IrSimpleFunctionSymbol =
+        symbolTable.descriptorExtension.referenceSimpleFunction(descriptor)
+
+    actual fun referenceConstructor(descriptor: ClassConstructorDescriptor): IrConstructorSymbol =
+        symbolTable.descriptorExtension.referenceConstructor(descriptor)
+
+    actual fun referenceClass(descriptor: ClassDescriptor): IrClassSymbol =
+        symbolTable.descriptorExtension.referenceClass(descriptor)
+}
diff --git a/...pilerConfigurationAnalytics.kgp_1.8.20.kt → ...pilerConfigurationAnalytics.kgp_1.9.20.kt b/...pilerConfigurationAnalytics.kgp_1.8.20.kt → ...pilerConfigurationAnalytics.kgp_1.9.20.kt