Kotlin 2.3.20

buildSrc/settings.gradle.kts

@@ -4,6 +4,7 @@ dependencyResolutionManagement {
     repositories {
         mavenCentral()
         gradlePluginPortal()
+        maven("https://redirector.kotlinlang.org/maven/dev")
     }
     versionCatalogs {
         create("libs") {

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.3.0"
+kotlin = "2.3.20-Beta1"
 kotlin-idea = "2.3.0-dev-9992"
 kotlinx-coroutines = "1.10.1"
 kotlinx-binary-compatibility-validator = "0.16.3"

kmp-nativecoroutines-compiler/build.gradle.kts

@@ -12,6 +12,7 @@ plugins {
 repositories {
     mavenCentral()
     maven("https://cache-redirector.jetbrains.com/intellij-dependencies")
+    maven("https://redirector.kotlinlang.org/maven/dev")
 }
 
 sourceSets {

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/NativeFunction.kt

@@ -9,7 +9,7 @@
 import org.jetbrains.kotlin.fakeElement
 import org.jetbrains.kotlin.fir.copy
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
-import org.jetbrains.kotlin.fir.declarations.builder.buildSimpleFunction
+import org.jetbrains.kotlin.fir.declarations.builder.buildNamedFunction
 import org.jetbrains.kotlin.fir.declarations.origin
 import org.jetbrains.kotlin.fir.declarations.utils.isInline
 import org.jetbrains.kotlin.fir.extensions.FirExtension
@@ -27,7 +27,7 @@
 ): FirNamedFunctionSymbol? {
     val firCallableSignature = originalSymbol.getCallableSignature(session) ?: return null
     val callableSignature = firCallableSignature.signature
-    return buildSimpleFunction {
+    return buildNamedFunction {
         resolvePhase = FirResolvePhase.BODY_RESOLVE
         moduleData = session.moduleData
         origin = NativeCoroutinesDeclarationKey(
@@ -41,10 +41,11 @@
         name = callableId.callableName
 
         status = originalSymbol.getGeneratedDeclarationStatus(session)
             ?.copy(isInline = originalSymbol.isInline) ?: return null
         if (SwiftExport.NO_FUNC_RETURN_TYPES in swiftExport) {
             status = status.copy(isSuspend = callableSignature.isSuspend)
         }
+        isLocal = originalSymbol.isLocal
 
         dispatchReceiverType = originalSymbol.dispatchReceiverType
 

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/NativeProperty.kt

@@ -44,6 +44,7 @@ internal fun FirExtension.buildNativeProperty(
         name = callableId.callableName
 
         status = originalSymbol.getGeneratedDeclarationStatus(session) ?: return null
+        isLocal = originalSymbol.isLocal
 
         dispatchReceiverType = originalSymbol.dispatchReceiverType
 

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/SharedFlowReplayCache.kt

@@ -47,6 +47,7 @@ internal fun FirExtension.buildSharedFlowReplayCacheProperty(
         name = callableId.callableName
 
         status = originalSymbol.getGeneratedDeclarationStatus(session) ?: return null
+        isLocal = originalSymbol.isLocal
 
         dispatchReceiverType = originalSymbol.dispatchReceiverType
 

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/StateFlowValue.kt

@@ -48,6 +48,7 @@ internal fun FirExtension.buildStateFlowValueProperty(
         name = callableId.callableName
 
         status = originalSymbol.getGeneratedDeclarationStatus(session) ?: return null
+        isLocal = originalSymbol.isLocal
 
         dispatchReceiverType = originalSymbol.dispatchReceiverType
 

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/diagnostics/FirKmpNativeCoroutinesDeclarationChecker.kt

@@ -87,7 +87,7 @@ internal class FirKmpNativeCoroutinesDeclarationChecker(
 
     context(context: CheckerContext, reporter: DiagnosticReporter)
     override fun check(declaration: FirCallableDeclaration) {
-        if (declaration !is FirSimpleFunction && declaration !is FirProperty) return
+        if (declaration !is FirNamedFunction && declaration !is FirProperty) return
 
         fun KtDiagnosticFactory0.reportOn(annotation: FirAnnotation?) {
             if (annotation == null) return

kmp-nativecoroutines-compiler/src/test/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/runners/AbstractFirBaseCodegenTest.kt

@@ -8,10 +8,10 @@ import org.jetbrains.kotlin.config.JvmDefaultMode
 import org.jetbrains.kotlin.test.Constructor
 import org.jetbrains.kotlin.test.FirParser
 import org.jetbrains.kotlin.test.backend.handlers.IrPrettyKotlinDumpHandler
+import org.jetbrains.kotlin.test.backend.ir.BackendCliJvmFacade
 import org.jetbrains.kotlin.test.backend.ir.IrBackendInput
 import org.jetbrains.kotlin.test.backend.ir.IrConstCheckerHandler
 import org.jetbrains.kotlin.test.backend.ir.IrDiagnosticsHandler
-import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.builders.configureFirHandlersStep
 import org.jetbrains.kotlin.test.builders.configureIrHandlersStep
@@ -24,8 +24,8 @@ import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.FIR_DUMP
 import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.FULL_JDK
 import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.JVM_DEFAULT_MODE
 import org.jetbrains.kotlin.test.directives.configureFirParser
-import org.jetbrains.kotlin.test.frontend.fir.Fir2IrResultsConverter
-import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade
+import org.jetbrains.kotlin.test.frontend.fir.Fir2IrCliJvmFacade
+import org.jetbrains.kotlin.test.frontend.fir.FirCliJvmFacade
 import org.jetbrains.kotlin.test.frontend.fir.FirMetaInfoDiffSuppressor
 import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact
 import org.jetbrains.kotlin.test.frontend.fir.handlers.FirCfgDumpHandler
@@ -58,11 +58,11 @@ abstract class AbstractFirBaseCodegenTest(
     }
 
     final override val frontendFacade: Constructor<FrontendFacade<FirOutputArtifact>>
-        get() = ::FirFrontendFacade
+        get() = ::FirCliJvmFacade
     final override val frontendToBackendConverter: Constructor<Frontend2BackendConverter<FirOutputArtifact, IrBackendInput>>
-        get() = ::Fir2IrResultsConverter
+        get() = ::Fir2IrCliJvmFacade
     final override val backendFacade: Constructor<BackendFacade<IrBackendInput, BinaryArtifacts.Jvm>>
-        get() = ::JvmIrBackendFacade
+        get() = ::BackendCliJvmFacade
 
     override fun configure(builder: TestConfigurationBuilder) = with(builder) {
         super.configure(builder)

kmp-nativecoroutines-compiler/src/testData/codegen/annotations.fir.txt

@@ -35,35 +35,35 @@ FILE: annotations.kt
     }
     public final fun box(): R|kotlin/String| {
         ^box R|com/rickclephas/kmp/nativecoroutines/runBoxTest|(<L> = runBoxTest@fun R|com/rickclephas/kmp/nativecoroutines/BoxTest|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
-            this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.await|<R|kotlin/String|>(<L> = await@fun <anonymous>(): R|{com/rickclephas/kmp/nativecoroutines/NativeSuspend<kotlin/String>=} ({@R|kotlin/ParameterName|(name = String(onResult))  com/rickclephas/kmp/nativecoroutines/NativeCallback<kotlin/String>=} @R|kotlin/ParameterName|(name = String(onResult))  kotlin/Function2<kotlin/String, kotlin/Unit, kotlin/Unit>, {@R|kotlin/ParameterName|(name = String(onError))  com/rickclephas/kmp/nativecoroutines/NativeCallback<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable>=} @R|kotlin/ParameterName|(name = String(onError))  kotlin/Function2<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit, kotlin/Unit>, {@R|kotlin/ParameterName|(name = String(onCancelled))  com/rickclephas/kmp/nativecoroutines/NativeCallback<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable>=} @R|kotlin/ParameterName|(name = String(onCancelled))  kotlin/Function2<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit, kotlin/Unit>) -> {com/rickclephas/kmp/nativecoroutines/NativeCancellable=} kotlin/Function0<kotlin/Unit>| <inline=NoInline>  {
+            this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.await|<R|kotlin/String|>(<L> = await@fun <anonymous>(): R|{com/rickclephas/kmp/nativecoroutines/NativeSuspend<kotlin/String>=} ((kotlin/String, kotlin/Unit) -> kotlin/Unit, ({com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit) -> kotlin/Unit, ({com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit) -> kotlin/Unit) -> () -> kotlin/Unit| <inline=NoInline>  {
                 ^ R|/deprecatedFunction1Native|()
             }
             )
-            this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.await|<R|kotlin/String|>(<L> = await@fun <anonymous>(): R|{com/rickclephas/kmp/nativecoroutines/NativeSuspend<kotlin/String>=} ({@R|kotlin/ParameterName|(name = String(onResult))  com/rickclephas/kmp/nativecoroutines/NativeCallback<kotlin/String>=} @R|kotlin/ParameterName|(name = String(onResult))  kotlin/Function2<kotlin/String, kotlin/Unit, kotlin/Unit>, {@R|kotlin/ParameterName|(name = String(onError))  com/rickclephas/kmp/nativecoroutines/NativeCallback<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable>=} @R|kotlin/ParameterName|(name = String(onError))  kotlin/Function2<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit, kotlin/Unit>, {@R|kotlin/ParameterName|(name = String(onCancelled))  com/rickclephas/kmp/nativecoroutines/NativeCallback<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable>=} @R|kotlin/ParameterName|(name = String(onCancelled))  kotlin/Function2<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit, kotlin/Unit>) -> {com/rickclephas/kmp/nativecoroutines/NativeCancellable=} kotlin/Function0<kotlin/Unit>| <inline=NoInline>  {
+            this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.await|<R|kotlin/String|>(<L> = await@fun <anonymous>(): R|{com/rickclephas/kmp/nativecoroutines/NativeSuspend<kotlin/String>=} ((kotlin/String, kotlin/Unit) -> kotlin/Unit, ({com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit) -> kotlin/Unit, ({com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit) -> kotlin/Unit) -> () -> kotlin/Unit| <inline=NoInline>  {
                 ^ R|/deprecatedFunction2Native|()
             }
             )
             this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.collect|<R|kotlin/String|>(R|/deprecatedProperty1Native|)
             this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.collect|<R|kotlin/String|>(R|/deprecatedProperty2Native|)
             this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.collect|<R|kotlin/String|>(R|/deprecatedProperty4Native|, Int(1))
             this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.value|<R|kotlin/String|>(R|/deprecatedProperty4Value|)
-            this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.await|<R|kotlin/String|>(<L> = await@fun <anonymous>(): R|{com/rickclephas/kmp/nativecoroutines/NativeSuspend<kotlin/String>=} ({@R|kotlin/ParameterName|(name = String(onResult))  com/rickclephas/kmp/nativecoroutines/NativeCallback<kotlin/String>=} @R|kotlin/ParameterName|(name = String(onResult))  kotlin/Function2<kotlin/String, kotlin/Unit, kotlin/Unit>, {@R|kotlin/ParameterName|(name = String(onError))  com/rickclephas/kmp/nativecoroutines/NativeCallback<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable>=} @R|kotlin/ParameterName|(name = String(onError))  kotlin/Function2<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit, kotlin/Unit>, {@R|kotlin/ParameterName|(name = String(onCancelled))  com/rickclephas/kmp/nativecoroutines/NativeCallback<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable>=} @R|kotlin/ParameterName|(name = String(onCancelled))  kotlin/Function2<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit, kotlin/Unit>) -> {com/rickclephas/kmp/nativecoroutines/NativeCancellable=} kotlin/Function0<kotlin/Unit>| <inline=NoInline>  {
+            this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.await|<R|kotlin/String|>(<L> = await@fun <anonymous>(): R|{com/rickclephas/kmp/nativecoroutines/NativeSuspend<kotlin/String>=} ((kotlin/String, kotlin/Unit) -> kotlin/Unit, ({com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit) -> kotlin/Unit, ({com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit) -> kotlin/Unit) -> () -> kotlin/Unit| <inline=NoInline>  {
                 ^ R|/objCNameFunction1Native|()
             }
             )
-            this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.await|<R|kotlin/String|>(<L> = await@fun <anonymous>(): R|{com/rickclephas/kmp/nativecoroutines/NativeSuspend<kotlin/String>=} ({@R|kotlin/ParameterName|(name = String(onResult))  com/rickclephas/kmp/nativecoroutines/NativeCallback<kotlin/String>=} @R|kotlin/ParameterName|(name = String(onResult))  kotlin/Function2<kotlin/String, kotlin/Unit, kotlin/Unit>, {@R|kotlin/ParameterName|(name = String(onError))  com/rickclephas/kmp/nativecoroutines/NativeCallback<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable>=} @R|kotlin/ParameterName|(name = String(onError))  kotlin/Function2<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit, kotlin/Unit>, {@R|kotlin/ParameterName|(name = String(onCancelled))  com/rickclephas/kmp/nativecoroutines/NativeCallback<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable>=} @R|kotlin/ParameterName|(name = String(onCancelled))  kotlin/Function2<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit, kotlin/Unit>) -> {com/rickclephas/kmp/nativecoroutines/NativeCancellable=} kotlin/Function0<kotlin/Unit>| <inline=NoInline>  {
+            this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.await|<R|kotlin/String|>(<L> = await@fun <anonymous>(): R|{com/rickclephas/kmp/nativecoroutines/NativeSuspend<kotlin/String>=} ((kotlin/String, kotlin/Unit) -> kotlin/Unit, ({com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit) -> kotlin/Unit, ({com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit) -> kotlin/Unit) -> () -> kotlin/Unit| <inline=NoInline>  {
                 ^ R|/objCNameFunction2Native|()
             }
             )
-            this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.await|<R|kotlin/String|>(<L> = await@fun <anonymous>(): R|{com/rickclephas/kmp/nativecoroutines/NativeSuspend<kotlin/String>=} ({@R|kotlin/ParameterName|(name = String(onResult))  com/rickclephas/kmp/nativecoroutines/NativeCallback<kotlin/String>=} @R|kotlin/ParameterName|(name = String(onResult))  kotlin/Function2<kotlin/String, kotlin/Unit, kotlin/Unit>, {@R|kotlin/ParameterName|(name = String(onError))  com/rickclephas/kmp/nativecoroutines/NativeCallback<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable>=} @R|kotlin/ParameterName|(name = String(onError))  kotlin/Function2<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit, kotlin/Unit>, {@R|kotlin/ParameterName|(name = String(onCancelled))  com/rickclephas/kmp/nativecoroutines/NativeCallback<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable>=} @R|kotlin/ParameterName|(name = String(onCancelled))  kotlin/Function2<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit, kotlin/Unit>) -> {com/rickclephas/kmp/nativecoroutines/NativeCancellable=} kotlin/Function0<kotlin/Unit>| <inline=NoInline>  {
+            this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.await|<R|kotlin/String|>(<L> = await@fun <anonymous>(): R|{com/rickclephas/kmp/nativecoroutines/NativeSuspend<kotlin/String>=} ((kotlin/String, kotlin/Unit) -> kotlin/Unit, ({com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit) -> kotlin/Unit, ({com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit) -> kotlin/Unit) -> () -> kotlin/Unit| <inline=NoInline>  {
                 ^ R|/objCNameFunction3Native|()
             }
             )
             this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.collect|<R|kotlin/String|>(R|/objCNameProperty1Native|, Int(1))
             this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.value|<R|kotlin/String|>(R|/objCNameProperty1Value|)
             this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.collect|<R|kotlin/String|>(R|/objCNameProperty2Flow|, Int(1))
             this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.value|<R|kotlin/String|>(R|/objCNameProperty2Value|)
-            this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.await|<R|kotlin/String|>(<L> = await@fun <anonymous>(): R|{com/rickclephas/kmp/nativecoroutines/NativeSuspend<kotlin/String>=} ({@R|kotlin/ParameterName|(name = String(onResult))  com/rickclephas/kmp/nativecoroutines/NativeCallback<kotlin/String>=} @R|kotlin/ParameterName|(name = String(onResult))  kotlin/Function2<kotlin/String, kotlin/Unit, kotlin/Unit>, {@R|kotlin/ParameterName|(name = String(onError))  com/rickclephas/kmp/nativecoroutines/NativeCallback<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable>=} @R|kotlin/ParameterName|(name = String(onError))  kotlin/Function2<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit, kotlin/Unit>, {@R|kotlin/ParameterName|(name = String(onCancelled))  com/rickclephas/kmp/nativecoroutines/NativeCallback<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable>=} @R|kotlin/ParameterName|(name = String(onCancelled))  kotlin/Function2<{com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit, kotlin/Unit>) -> {com/rickclephas/kmp/nativecoroutines/NativeCancellable=} kotlin/Function0<kotlin/Unit>| <inline=NoInline>  {
+            this@R|special/anonymous|.R|com/rickclephas/kmp/nativecoroutines/BoxTest.await|<R|kotlin/String|>(<L> = await@fun <anonymous>(): R|{com/rickclephas/kmp/nativecoroutines/NativeSuspend<kotlin/String>=} ((kotlin/String, kotlin/Unit) -> kotlin/Unit, ({com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit) -> kotlin/Unit, ({com/rickclephas/kmp/nativecoroutines/NativeError=} kotlin/Throwable, kotlin/Unit) -> kotlin/Unit) -> () -> kotlin/Unit| <inline=NoInline>  {
                 ^ R|/objCNameFunctionParameterNative|(String(OK13))
             }
             )