Fix all compiler versions

Mr3zee · Mr3zee · commit b604652e7c02 · 2025-06-13T21:39:53.000+02:00
diff --git a/compiler-plugin/compiler-plugin-backend/src/main/core/kotlinx/rpc/codegen/VersionSpecificApi.kt b/compiler-plugin/compiler-plugin-backend/src/main/core/kotlinx/rpc/codegen/VersionSpecificApi.kt
@@ -14,6 +14,8 @@ import org.jetbrains.kotlin.descriptors.SourceElement
 import org.jetbrains.kotlin.ir.builders.declarations.IrFieldBuilder
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
+import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression
 import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin
 import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
@@ -53,6 +55,12 @@ interface VersionSpecificApi {
 
     var IrConstructor.isPrimaryVS: Boolean
 
+    val IrConstructor.parametersVS: List<IrValueParameter>
+
+    val IrConstructorCall.argumentsVS: List<IrExpression?>
+
+    fun IrType.isNullableVS(): Boolean
+
     val messageCollectorKey: CompilerConfigurationKey<MessageCollector>
 
     companion object {
diff --git a/compiler-plugin/compiler-plugin-backend/src/main/core/kotlinx/rpc/codegen/extension/RpcStubGenerator.kt b/compiler-plugin/compiler-plugin-backend/src/main/core/kotlinx/rpc/codegen/extension/RpcStubGenerator.kt
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.symbols.IrSymbol
 import org.jetbrains.kotlin.ir.symbols.IrValueSymbol
 import org.jetbrains.kotlin.ir.types.*
-import org.jetbrains.kotlin.ir.util.isNullable
 import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.name.SpecialNames
@@ -603,7 +602,7 @@ internal class RpcStubGenerator(
                                             }
                                         }
 
-                                        if (arg.type.isNullable()) {
+                                        if (vsApi { arg.type.isNullableVS() }) {
                                             +irSafeAs(parameter, arg.type)
                                         } else {
                                             +irAs(parameter, arg.type)
@@ -1061,7 +1060,7 @@ internal class RpcStubGenerator(
                             elements = type.annotations
                                 .filter { it.type.isSerializableAnnotation() }
                                 .memoryOptimizedMap {
-                                    val kClassValue = it.arguments.singleOrNull()
+                                    val kClassValue = vsApi { it.argumentsVS }.singleOrNull()
                                             as? IrClassReference
                                         ?: error("Expected single not null value parameter of KSerializer::class for @Serializable annotation on type '${type.dumpKotlinLike()}'")
 
@@ -1089,10 +1088,10 @@ internal class RpcStubGenerator(
             val constructor = classSymbol.owner.primaryConstructor
                 ?: error("Expected primary constructor for a serializer '${dumpKotlinLike()}'")
 
-            if (constructor.parameters.isNotEmpty()) {
+            if (vsApi { constructor.parametersVS.isNotEmpty() }) {
                 error(
                     "Primary constructor for a serializer '${dumpKotlinLike()}' can't have parameters: " +
-                            constructor.parameters.joinToString { it.dumpKotlinLike() }
+                            vsApi { constructor.parametersVS }.joinToString { it.dumpKotlinLike() }
                 )
             }
 
diff --git a/compiler-plugin/compiler-plugin-backend/src/main/latest/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt b/compiler-plugin/compiler-plugin-backend/src/main/latest/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt
@@ -15,6 +15,8 @@ import org.jetbrains.kotlin.descriptors.SourceElement
 import org.jetbrains.kotlin.ir.builders.declarations.IrFieldBuilder
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
+import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin
 import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrConstructorCallImpl
@@ -23,6 +25,7 @@ import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.util.copyTo
+import org.jetbrains.kotlin.ir.util.isNullable
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
@@ -58,6 +61,16 @@ object VersionSpecificApiImpl : VersionSpecificApi {
             isPrimary = value
         }
 
+    override val IrConstructor.parametersVS: List<IrValueParameter>
+        get() = parameters
+
+    override val IrConstructorCall.argumentsVS: List<IrExpression?>
+        get() = arguments
+
+    override fun IrType.isNullableVS(): Boolean {
+        return isNullable()
+    }
+
     override fun referenceClass(context: IrPluginContext, packageName: String, name: String): IrClassSymbol? {
         return context.referenceClass(
             ClassId(
diff --git a/compiler-plugin/compiler-plugin-backend/src/main/pre_2_0_10/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt b/compiler-plugin/compiler-plugin-backend/src/main/pre_2_0_10/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt
@@ -12,16 +12,20 @@ import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.config.CompilerConfigurationKey
 import org.jetbrains.kotlin.descriptors.SourceElement
+import org.jetbrains.kotlin.ir.backend.js.utils.valueArguments
 import org.jetbrains.kotlin.ir.builders.declarations.IrFieldBuilder
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
+import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin
 import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrConstructorCallImpl
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.isNullable
 import org.jetbrains.kotlin.ir.util.copyTo
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
@@ -56,6 +60,16 @@ object VersionSpecificApiImpl : VersionSpecificApi {
             isPrimary = value
         }
 
+    override val IrConstructor.parametersVS: List<IrValueParameter>
+        get() = valueParameters
+
+    override val IrConstructorCall.argumentsVS: List<IrExpression?>
+        get() = valueArguments
+
+    override fun IrType.isNullableVS(): Boolean {
+        return isNullable()
+    }
+
     override fun referenceClass(context: IrPluginContext, packageName: String, name: String): IrClassSymbol? {
         return context.referenceClass(
             ClassId(
diff --git a/compiler-plugin/compiler-plugin-backend/src/main/pre_2_0_21/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt b/compiler-plugin/compiler-plugin-backend/src/main/pre_2_0_21/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt
@@ -11,9 +11,12 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.config.CommonConfigurationKeys
 import org.jetbrains.kotlin.config.CompilerConfigurationKey
 import org.jetbrains.kotlin.descriptors.SourceElement
+import org.jetbrains.kotlin.ir.backend.js.utils.valueArguments
 import org.jetbrains.kotlin.ir.builders.declarations.IrFieldBuilder
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
+import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression
 import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin
 import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
@@ -22,6 +25,7 @@ import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.isNullable
 import org.jetbrains.kotlin.ir.util.copyTo
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
@@ -56,6 +60,16 @@ object VersionSpecificApiImpl : VersionSpecificApi {
             isPrimary = value
         }
 
+    override val IrConstructor.parametersVS: List<IrValueParameter>
+        get() = valueParameters
+
+    override val IrConstructorCall.argumentsVS: List<IrExpression?>
+        get() = valueArguments
+
+    override fun IrType.isNullableVS(): Boolean {
+        return isNullable()
+    }
+
     override fun referenceClass(context: IrPluginContext, packageName: String, name: String): IrClassSymbol? {
         return context.referenceClass(
             ClassId(
diff --git a/compiler-plugin/compiler-plugin-backend/src/main/v_2_2/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt b/compiler-plugin/compiler-plugin-backend/src/main/v_2_2/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt
@@ -14,6 +14,8 @@ import org.jetbrains.kotlin.descriptors.SourceElement
 import org.jetbrains.kotlin.ir.builders.declarations.IrFieldBuilder
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
+import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression
 import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin
 import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
@@ -23,6 +25,7 @@ import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.util.copyTo
+import org.jetbrains.kotlin.ir.util.isNullable
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
@@ -58,6 +61,16 @@ object VersionSpecificApiImpl : VersionSpecificApi {
             isPrimary = value
         }
 
+    override val IrConstructor.parametersVS: List<IrValueParameter>
+        get() = parameters
+
+    override val IrConstructorCall.argumentsVS: List<IrExpression?>
+        get() = arguments.toList()
+
+    override fun IrType.isNullableVS(): Boolean {
+        return isNullable()
+    }
+
     override fun referenceClass(context: IrPluginContext, packageName: String, name: String): IrClassSymbol? {
         return context.referenceClass(
             ClassId(
diff --git a/compiler-plugin/compiler-plugin-k2/src/main/core/kotlinx/rpc/codegen/FirVersionSpecificApi.kt b/compiler-plugin/compiler-plugin-k2/src/main/core/kotlinx/rpc/codegen/FirVersionSpecificApi.kt
@@ -36,6 +36,8 @@ interface FirVersionSpecificApi {
     fun FirRegularClass.declarationsVS(session: FirSession): List<FirBasedSymbol<*>>
 
     val FirResolvedTypeRef.coneTypeVS: ConeKotlinType
+
+    fun FirTypeRef.toRegularClassSymbolVS(session: FirSession): FirRegularClassSymbol?
 }
 
 inline fun <T> vsApi(body: FirVersionSpecificApi.() -> T): T {
diff --git a/compiler-plugin/compiler-plugin-k2/src/main/core/kotlinx/rpc/codegen/checkers/SerializableProperties.kt b/compiler-plugin/compiler-plugin-k2/src/main/core/kotlinx/rpc/codegen/checkers/SerializableProperties.kt
@@ -5,10 +5,10 @@
 package kotlinx.rpc.codegen.checkers
 
 import kotlinx.rpc.codegen.common.RpcClassId
+import kotlinx.rpc.codegen.vsApi
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.analysis.checkers.toRegularClassSymbol
 import org.jetbrains.kotlin.fir.caches.FirCache
 import org.jetbrains.kotlin.fir.caches.createCache
 import org.jetbrains.kotlin.fir.caches.firCachesFactory
@@ -112,5 +112,5 @@ private fun FirClassSymbol<*>.superClassOrAny(session: FirSession): FirRegularCl
         superType.fullyExpandedType(session)
             .toRegularClassSymbol(session)
             ?.takeIf { it.classKind == ClassKind.CLASS }
-    } ?: session.builtinTypes.anyType.toRegularClassSymbol(session) ?: error("Symbol for kotlin/Any not found")
+    } ?: vsApi { session.builtinTypes.anyType.toRegularClassSymbolVS(session) } ?: error("Symbol for kotlin/Any not found")
 }
diff --git a/compiler-plugin/compiler-plugin-k2/src/main/latest/kotlinx/rpc/codegen/FirVersionSpecificApiImpl.kt b/compiler-plugin/compiler-plugin-k2/src/main/latest/kotlinx/rpc/codegen/FirVersionSpecificApiImpl.kt
@@ -6,6 +6,7 @@ package kotlinx.rpc.codegen
 
 import org.jetbrains.kotlin.KtSourceElement
 import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.analysis.checkers.toRegularClassSymbol
 import org.jetbrains.kotlin.fir.declarations.FirFunction
 import org.jetbrains.kotlin.fir.declarations.FirRegularClass
 import org.jetbrains.kotlin.fir.resolve.toClassSymbol
@@ -55,4 +56,8 @@ object FirVersionSpecificApiImpl : FirVersionSpecificApi {
     }
 
     override val FirResolvedTypeRef.coneTypeVS: ConeKotlinType get() = coneType
+
+    override fun FirTypeRef.toRegularClassSymbolVS(session: FirSession): FirRegularClassSymbol? {
+        return toRegularClassSymbol(session)
+    }
 }
diff --git a/compiler-plugin/compiler-plugin-k2/src/main/pre_2_0_10/kotlinx/rpc/codegen/FirVersionSpecificApiImpl.kt b/compiler-plugin/compiler-plugin-k2/src/main/pre_2_0_10/kotlinx/rpc/codegen/FirVersionSpecificApiImpl.kt
@@ -6,6 +6,7 @@ package kotlinx.rpc.codegen
 
 import org.jetbrains.kotlin.KtSourceElement
 import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.analysis.checkers.toRegularClassSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
 import org.jetbrains.kotlin.fir.types.ConeClassLikeType
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
@@ -56,4 +57,8 @@ object FirVersionSpecificApiImpl : FirVersionSpecificApi {
     }
 
     override val FirResolvedTypeRef.coneTypeVS: ConeKotlinType get() = type
+
+    override fun FirTypeRef.toRegularClassSymbolVS(session: FirSession): FirRegularClassSymbol? {
+        return toRegularClassSymbol(session)
+    }
 }
diff --git a/compiler-plugin/compiler-plugin-k2/src/main/pre_2_0_21/kotlinx/rpc/codegen/FirVersionSpecificApiImpl.kt b/compiler-plugin/compiler-plugin-k2/src/main/pre_2_0_21/kotlinx/rpc/codegen/FirVersionSpecificApiImpl.kt
@@ -6,6 +6,7 @@ package kotlinx.rpc.codegen
 
 import org.jetbrains.kotlin.KtSourceElement
 import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.analysis.checkers.toRegularClassSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
 import org.jetbrains.kotlin.fir.toFirResolvedTypeRef
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
@@ -55,4 +56,8 @@ object FirVersionSpecificApiImpl : FirVersionSpecificApi {
     }
 
     override val FirResolvedTypeRef.coneTypeVS: ConeKotlinType get() = type
+
+    override fun FirTypeRef.toRegularClassSymbolVS(session: FirSession): FirRegularClassSymbol? {
+        return toRegularClassSymbol(session)
+    }
 }
diff --git a/compiler-plugin/compiler-plugin-k2/src/main/v_2_2/kotlinx/rpc/codegen/FirVersionSpecificApiImpl.kt b/compiler-plugin/compiler-plugin-k2/src/main/v_2_2/kotlinx/rpc/codegen/FirVersionSpecificApiImpl.kt
@@ -6,6 +6,7 @@ package kotlinx.rpc.codegen
 
 import org.jetbrains.kotlin.KtSourceElement
 import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.analysis.checkers.toRegularClassSymbol
 import org.jetbrains.kotlin.fir.declarations.declaredFunctions
 import org.jetbrains.kotlin.fir.declarations.constructors
 import org.jetbrains.kotlin.fir.resolve.toClassSymbol
@@ -57,4 +58,8 @@ object FirVersionSpecificApiImpl : FirVersionSpecificApi {
     }
 
     override val FirResolvedTypeRef.coneTypeVS: ConeKotlinType get() = coneType
+
+    override fun FirTypeRef.toRegularClassSymbolVS(session: FirSession): FirRegularClassSymbol? {
+        return toRegularClassSymbol(session)
+    }
 }
diff --git a/compiler-plugin/compiler-plugin-k2/src/main/v_2_2_2/kotlinx/rpc/codegen/FirVersionSpecificApiImpl.kt b/compiler-plugin/compiler-plugin-k2/src/main/v_2_2_2/kotlinx/rpc/codegen/FirVersionSpecificApiImpl.kt
@@ -6,6 +6,7 @@ package kotlinx.rpc.codegen
 
 import org.jetbrains.kotlin.KtSourceElement
 import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.analysis.checkers.toRegularClassSymbol
 import org.jetbrains.kotlin.fir.declarations.declaredFunctions
 import org.jetbrains.kotlin.fir.declarations.constructors
 import org.jetbrains.kotlin.fir.resolve.toClassSymbol
@@ -57,4 +58,8 @@ object FirVersionSpecificApiImpl : FirVersionSpecificApi {
     }
 
     override val FirResolvedTypeRef.coneTypeVS: ConeKotlinType get() = coneType
+
+    override fun FirTypeRef.toRegularClassSymbolVS(session: FirSession): FirRegularClassSymbol? {
+        return toRegularClassSymbol(session)
+    }
 }
diff --git a/compiler-plugin/compiler-plugin-k2/src/main/v_2_2_2/kotlinx/rpc/codegen/checkers/diagnostics/DiagnosticFactories.kt b/compiler-plugin/compiler-plugin-k2/src/main/v_2_2_2/kotlinx/rpc/codegen/checkers/diagnostics/DiagnosticFactories.kt
diff --git a/krpc/krpc-test/build.gradle.kts b/krpc/krpc-test/build.gradle.kts
@@ -2,7 +2,6 @@
  * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
-import kotlinx.rpc.RpcStrictMode
 import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
 import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
 import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ interface FirVersionSpecificApi {`
`36`	`36`	`fun FirRegularClass.declarationsVS(session: FirSession): List<FirBasedSymbol<*>>`
`37`	`37`
`38`	`38`	`val FirResolvedTypeRef.coneTypeVS: ConeKotlinType`
	`39`	`+`
	`40`	`+ fun FirTypeRef.toRegularClassSymbolVS(session: FirSession): FirRegularClassSymbol?`
`39`	`41`	`}`
`40`	`42`
`41`	`43`	`inline fun <T> vsApi(body: FirVersionSpecificApi.() -> T): T {`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ package kotlinx.rpc.codegen`
`6`	`6`
`7`	`7`	`import org.jetbrains.kotlin.KtSourceElement`
`8`	`8`	`import org.jetbrains.kotlin.fir.FirSession`
	`9`	`+import org.jetbrains.kotlin.fir.analysis.checkers.toRegularClassSymbol`
`9`	`10`	`import org.jetbrains.kotlin.fir.declarations.FirFunction`
`10`	`11`	`import org.jetbrains.kotlin.fir.declarations.FirRegularClass`
`11`	`12`	`import org.jetbrains.kotlin.fir.resolve.toClassSymbol`
`@@ -55,4 +56,8 @@ object FirVersionSpecificApiImpl : FirVersionSpecificApi {`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`override val FirResolvedTypeRef.coneTypeVS: ConeKotlinType get() = coneType`
	`59`	`+`
	`60`	`+ override fun FirTypeRef.toRegularClassSymbolVS(session: FirSession): FirRegularClassSymbol? {`
	`61`	`+ return toRegularClassSymbol(session)`
	`62`	`+ }`
`58`	`63`	`}`