Change Kotlin version to 2.1.20-dev-6370

JavierSegoviaCordoba · Dec 13, 2024 · 3f20a95 · 3f20a95
1 parent c70101f
commit 3f20a95
Show file tree

Hide file tree

Showing 24 changed files with 85 additions and 63 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
 hubdle = "0.8.1"
 hubdleCatalog = "0.4.1"
-javiersc-kotlin-compiler-extensions = "0.5.1+2.1.0"
-jetbrains-kotlin = "2.1.0"
+javiersc-kotlin-compiler-extensions = "0.6.0+2.1.20-dev-6370-SNAPSHOT"
+jetbrains-kotlin = "2.1.20-dev-6370"
 
 [libraries]
 hubdle-catalog = { module = "com.javiersc.hubdle:hubdle-version-catalog", version.ref = "hubdleCatalog" }

diff --git a/...com/javiersc/kotlin/kopy/compiler/fir/checker/checkers/expression/BreakingCallsChecker.kt b/...com/javiersc/kotlin/kopy/compiler/fir/checker/checkers/expression/BreakingCallsChecker.kt
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.fir.analysis.checkers.MppCheckerKind
 import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
 import org.jetbrains.kotlin.fir.analysis.checkers.expression.FirCallChecker
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
+import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter
 import org.jetbrains.kotlin.fir.declarations.hasAnnotation
 import org.jetbrains.kotlin.fir.declarations.utils.isData
 import org.jetbrains.kotlin.fir.expressions.FirAnonymousFunctionExpression
@@ -31,8 +32,8 @@ import org.jetbrains.kotlin.fir.expressions.FirThisReceiverExpression
 import org.jetbrains.kotlin.fir.references.toResolvedFunctionSymbol
 import org.jetbrains.kotlin.fir.render
 import org.jetbrains.kotlin.fir.resolve.toRegularClassSymbol
-import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
+import org.jetbrains.kotlin.fir.symbols.impl.FirThisOwnerSymbol
 import org.jetbrains.kotlin.fir.types.resolvedType
 
 internal object BreakingCallsChecker : FirCallChecker(MppCheckerKind.Common) {
@@ -95,7 +96,7 @@ internal object BreakingCallsChecker : FirCallChecker(MppCheckerKind.Common) {
         val extensionReceiver: FirPropertyAccessExpression =
             setOrUpdateCall.extensionReceiver?.asFirOrNull<FirPropertyAccessExpression>()
                 ?: return Failure.BrokenChain(setOrUpdateCall)
-        val updateOrSetThisBoundSymbol: FirBasedSymbol<*> =
+        val updateOrSetThisBoundSymbol: FirThisOwnerSymbol<*> =
             setOrUpdateCall.dispatchReceiver
                 ?.asFirOrNull<FirThisReceiverExpression>()
                 ?.calleeReference
@@ -120,7 +121,11 @@ internal object BreakingCallsChecker : FirCallChecker(MppCheckerKind.Common) {
                 ?.asFirOrNull<FirThisReceiverExpression>()
                 ?.calleeReference
                 ?.boundSymbol
-                ?.fir ?: return Failure.NoCopyScope(setOrUpdateCall)
+                ?.fir
+                ?.asFirOrNull<FirReceiverParameter>()
+                ?.containingDeclarationSymbol
+                ?.fir
+                ?: return Failure.NoCopyScope(setOrUpdateCall)
         val isCopyScope: Boolean =
             context.callsOrAssignments
                 .asSequence()
@@ -147,9 +152,9 @@ internal object BreakingCallsChecker : FirCallChecker(MppCheckerKind.Common) {
 
     private fun FirExpression.isBreakingChainCall(
         session: FirSession,
-        updateOrSetThisBoundSymbol: FirBasedSymbol<*>
+        updateOrSetThisBoundSymbol: FirThisOwnerSymbol<*>,
     ): CheckerResult {
-        val thisBoundSymbol: FirBasedSymbol<*>? =
+        val thisBoundSymbol: FirThisOwnerSymbol<*>? =
             this.asFirOrNull<FirThisReceiverExpression>()?.calleeReference?.boundSymbol
         if (updateOrSetThisBoundSymbol == thisBoundSymbol) return Success
 
@@ -159,7 +164,7 @@ internal object BreakingCallsChecker : FirCallChecker(MppCheckerKind.Common) {
 
         val receiver: FirExpression? = this.dispatchReceiver
 
-        val dispatcherBoundSymbol: FirBasedSymbol<*>? =
+        val dispatcherBoundSymbol: FirThisOwnerSymbol<*>? =
             receiver?.asFirOrNull<FirThisReceiverExpression>()?.calleeReference?.boundSymbol
 
         val hasSameBoundSymbol: Boolean = dispatcherBoundSymbol == updateOrSetThisBoundSymbol

diff --git a/...m/javiersc/kotlin/kopy/compiler/fir/generation/FirKopyAssignExpressionAltererExtension.kt b/...m/javiersc/kotlin/kopy/compiler/fir/generation/FirKopyAssignExpressionAltererExtension.kt
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.expressions.buildUnaryArgumentList
 import org.jetbrains.kotlin.fir.expressions.builder.buildFunctionCall
 import org.jetbrains.kotlin.fir.expressions.builder.buildPropertyAccessExpression
 import org.jetbrains.kotlin.fir.expressions.calleeReference
-import org.jetbrains.kotlin.fir.expressions.contextReceiverArguments
+import org.jetbrains.kotlin.fir.expressions.contextArguments
 import org.jetbrains.kotlin.fir.expressions.dispatchReceiver
 import org.jetbrains.kotlin.fir.expressions.explicitReceiver
 import org.jetbrains.kotlin.fir.expressions.extensionReceiver
@@ -71,7 +71,7 @@ internal class FirKopyAssignExpressionAltererExtension(
                 explicitReceiver = variableAssignment.explicitReceiver
                 dispatchReceiver = variableAssignment.dispatchReceiver
                 extensionReceiver = variableAssignment.extensionReceiver
-                contextReceiverArguments += variableAssignment.contextReceiverArguments
+                contextArguments += variableAssignment.contextArguments
             }
             argumentList = buildUnaryArgumentList(rightArgument)
             calleeReference = buildSimpleNamedReference {

diff --git a/.../kotlin/com/javiersc/kotlin/kopy/compiler/ir/transformers/IrSetOrUpdateCallTransformer.kt b/.../kotlin/com/javiersc/kotlin/kopy/compiler/ir/transformers/IrSetOrUpdateCallTransformer.kt
@@ -53,7 +53,7 @@ import org.jetbrains.kotlin.ir.types.classOrFail
 import org.jetbrains.kotlin.ir.types.typeWith
 import org.jetbrains.kotlin.ir.util.deepCopyWithSymbols
 import org.jetbrains.kotlin.ir.util.functions
-import org.jetbrains.kotlin.ir.util.getArguments
+import org.jetbrains.kotlin.ir.util.getArgumentsWithIr
 import org.jetbrains.kotlin.ir.util.getPropertyGetter
 import org.jetbrains.kotlin.ir.util.getSimpleFunction
 import org.jetbrains.kotlin.ir.util.indexOrMinusOne
@@ -90,9 +90,8 @@ internal class IrSetOrUpdateCallTransformer(
         return originalCallCallWithAlsoCall
     }
 
-    private inner class SetValueTransformer(
-        private val expressionCall: IrCall,
-    ) : IrElementTransformerVoid() {
+    private inner class SetValueTransformer(private val expressionCall: IrCall) :
+        IrElementTransformerVoid() {
         override fun visitExpression(expression: IrExpression): IrExpression {
             fun original(): IrExpression = super.visitExpression(expression)
             if (expression !in expressionCall.valueArguments) return original()
@@ -106,9 +105,8 @@ internal class IrSetOrUpdateCallTransformer(
         }
     }
 
-    private inner class UpdateReturnTransformer(
-        private val expressionCall: IrCall,
-    ) : IrElementTransformerVoid() {
+    private inner class UpdateReturnTransformer(private val expressionCall: IrCall) :
+        IrElementTransformerVoid() {
         override fun visitReturn(expression: IrReturn): IrExpression {
             fun original(): IrExpression = super.visitReturn(expression)
             val parent: IrDeclarationParent =
@@ -132,7 +130,7 @@ internal class IrSetOrUpdateCallTransformer(
 
     private fun IrPluginContext.createAlsoCall(
         expression: IrCall,
-        expressionParent: IrDeclarationParent
+        expressionParent: IrDeclarationParent,
     ): IrCall? {
         val setOrUpdateType: IrType = expression.extensionReceiver?.type ?: return null
 
@@ -171,7 +169,7 @@ internal class IrSetOrUpdateCallTransformer(
     private fun createAlsoBlockFunction(
         expressionParent: IrDeclarationParent,
         setOrUpdateType: IrType,
-        expression: IrCall
+        expression: IrCall,
     ): IrSimpleFunction? {
         val alsoBlockFunction: IrSimpleFunction =
             pluginContext.irFactory
@@ -197,7 +195,7 @@ internal class IrSetOrUpdateCallTransformer(
                                     ?: return null
                             val atomicGetterLazySetFunctionCall: IrCall? =
                                 expression.createAtomicGetterLazySetFunctionCall(
-                                    copyChainCall = copyChainCall,
+                                    copyChainCall = copyChainCall
                                 )
                             if (atomicGetterLazySetFunctionCall != null) {
                                 +atomicGetterLazySetFunctionCall
@@ -230,7 +228,7 @@ internal class IrSetOrUpdateCallTransformer(
                     val isLast: Boolean = next == dispatchers.last()
                     val argumentValue: IrDeclarationReference =
                         if (isLast) alsoItValueParameterGetValue
-                        else next.apply { this.dispatchReceiver = current }
+                        else next.apply { insertDispatchReceiver(current) }
 
                     val copyCall: IrCall? =
                         current.symbol.createCopyCall(
@@ -246,8 +244,8 @@ internal class IrSetOrUpdateCallTransformer(
         val copyChainCall: IrCall =
             calls.reduce { acc, irCall ->
                 val argumentIndex: Int =
-                    irCall.getArguments().firstNotNullOfOrNull {
-                        val index = it.first.indexOrMinusOne
+                    irCall.getArgumentsWithIr().firstNotNullOfOrNull { (valueParameter, _) ->
+                        val index: Int = valueParameter.descriptor.indexOrMinusOne
                         if (index != -1) index else null
                     } ?: return null
                 irCall.putValueArgument(argumentIndex, acc)
@@ -271,10 +269,10 @@ internal class IrSetOrUpdateCallTransformer(
         buildList {
             val extensionReceiver: IrMemberAccessExpression<*> =
                 runCatching {
-                    extensionReceiver
-                        ?.asIrOrNull<IrMemberAccessExpression<*>>()
-                        ?.deepCopyWithSymbols()
-                }
+                        extensionReceiver
+                            ?.asIrOrNull<IrMemberAccessExpression<*>>()
+                            ?.deepCopyWithSymbols()
+                    }
                     .getOrNull() ?: return@buildList
 
             add(extensionReceiver)
@@ -303,8 +301,7 @@ internal class IrSetOrUpdateCallTransformer(
                 val kotlinCopyFunctionSymbol: IrSimpleFunctionSymbol =
                     dataClass.owner.functions
                         .firstOrNull {
-                            it.name == copyName &&
-                                !it.hasAnnotation(kopyFunctionCopyFqName)
+                            it.name == copyName && !it.hasAnnotation(kopyFunctionCopyFqName)
                         }
                         ?.symbol ?: return null
                 irCall(kotlinCopyFunctionSymbol).apply {

diff --git a/kopy-compiler/test-data/box/edge/no-kopy-annotation-on-one-data-class.fir.ir.txt b/kopy-compiler/test-data/box/edge/no-kopy-annotation-on-one-data-class.fir.ir.txt
@@ -68,7 +68,7 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-kopy-annotation-on-
       VALUE_PARAMETER name:zip index:3 type:kotlin.String
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Address modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Address modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' type=kotlin.Unit
     FUN GENERATED[com.javiersc.kotlin.kopy.compiler.fir.Key] name:copy visibility:public modality:FINAL <> ($this:com.javiersc.kotlin.kopy.playground.Address, copy:@[ExtensionFunctionType] kotlin.Function1<com.javiersc.kotlin.kopy.playground.Address, kotlin.Unit>) returnType:com.javiersc.kotlin.kopy.playground.Address [infix]
       annotations:
         KopyOptIn
@@ -358,7 +358,7 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-kopy-annotation-on-
       VALUE_PARAMETER name:last index:1 type:kotlin.String
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Name modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Name modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' type=kotlin.Unit
     FUN GENERATED[com.javiersc.kotlin.kopy.compiler.fir.Key] name:copy visibility:public modality:FINAL <> ($this:com.javiersc.kotlin.kopy.playground.Name, copy:@[ExtensionFunctionType] kotlin.Function1<com.javiersc.kotlin.kopy.playground.Name, kotlin.Unit>) returnType:com.javiersc.kotlin.kopy.playground.Name [infix]
       annotations:
         KopyOptIn
@@ -594,7 +594,7 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-kopy-annotation-on-
       VALUE_PARAMETER name:privateInfo index:2 type:com.javiersc.kotlin.kopy.playground.PrivateInfo
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Person modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Person modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' type=kotlin.Unit
     FUN GENERATED[com.javiersc.kotlin.kopy.compiler.fir.Key] name:copy visibility:public modality:FINAL <> ($this:com.javiersc.kotlin.kopy.playground.Person, copy:@[ExtensionFunctionType] kotlin.Function1<com.javiersc.kotlin.kopy.playground.Person, kotlin.Unit>) returnType:com.javiersc.kotlin.kopy.playground.Person [infix]
       annotations:
         KopyOptIn
@@ -836,7 +836,7 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-kopy-annotation-on-
       VALUE_PARAMETER name:dob index:1 type:kotlin.String
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:PrivateInfo modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:PrivateInfo modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' type=kotlin.Unit
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:com.javiersc.kotlin.kopy.playground.PrivateInfo) returnType:kotlin.String [operator]
       $this: VALUE_PARAMETER name:<this> type:com.javiersc.kotlin.kopy.playground.PrivateInfo
       BLOCK_BODY

diff --git a/kopy-compiler/test-data/box/edge/simple-1.fir.ir.txt b/kopy-compiler/test-data/box/edge/simple-1.fir.ir.txt
@@ -44,7 +44,7 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/simple-1.kt
       VALUE_PARAMETER name:pet index:1 type:com.javiersc.kotlin.kopy.playground.Pet
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:House modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:House modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' type=kotlin.Unit
     FUN GENERATED[com.javiersc.kotlin.kopy.compiler.fir.Key] name:copy visibility:public modality:FINAL <> ($this:com.javiersc.kotlin.kopy.playground.House, copy:@[ExtensionFunctionType] kotlin.Function1<com.javiersc.kotlin.kopy.playground.House, kotlin.Unit>) returnType:com.javiersc.kotlin.kopy.playground.House [infix]
       annotations:
         KopyOptIn
@@ -268,7 +268,7 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/simple-1.kt
       VALUE_PARAMETER name:age index:1 type:kotlin.Int
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Pet modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Pet modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' type=kotlin.Unit
     FUN GENERATED[com.javiersc.kotlin.kopy.compiler.fir.Key] name:copy visibility:public modality:FINAL <> ($this:com.javiersc.kotlin.kopy.playground.Pet, copy:@[ExtensionFunctionType] kotlin.Function1<com.javiersc.kotlin.kopy.playground.Pet, kotlin.Unit>) returnType:com.javiersc.kotlin.kopy.playground.Pet [infix]
       annotations:
         KopyOptIn

diff --git a/kopy-compiler/test-data/box/nest-copy-set.fir.ir.txt b/kopy-compiler/test-data/box/nest-copy-set.fir.ir.txt
@@ -44,7 +44,7 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/nest-copy-set.kt
       VALUE_PARAMETER name:isValid index:1 type:kotlin.Boolean
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Bar modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Bar modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' type=kotlin.Unit
     FUN GENERATED[com.javiersc.kotlin.kopy.compiler.fir.Key] name:copy visibility:public modality:FINAL <> ($this:com.javiersc.kotlin.kopy.playground.Bar, copy:@[ExtensionFunctionType] kotlin.Function1<com.javiersc.kotlin.kopy.playground.Bar, kotlin.Unit>) returnType:com.javiersc.kotlin.kopy.playground.Bar [infix]
       annotations:
         KopyOptIn
@@ -268,7 +268,7 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/nest-copy-set.kt
       VALUE_PARAMETER name:text index:1 type:kotlin.String
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Baz modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Baz modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' type=kotlin.Unit
     FUN GENERATED[com.javiersc.kotlin.kopy.compiler.fir.Key] name:copy visibility:public modality:FINAL <> ($this:com.javiersc.kotlin.kopy.playground.Baz, copy:@[ExtensionFunctionType] kotlin.Function1<com.javiersc.kotlin.kopy.playground.Baz, kotlin.Unit>) returnType:com.javiersc.kotlin.kopy.playground.Baz [infix]
       annotations:
         KopyOptIn
@@ -492,7 +492,7 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/nest-copy-set.kt
       VALUE_PARAMETER name:letter index:1 type:kotlin.Char
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Foo modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Foo modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' type=kotlin.Unit
     FUN GENERATED[com.javiersc.kotlin.kopy.compiler.fir.Key] name:copy visibility:public modality:FINAL <> ($this:com.javiersc.kotlin.kopy.playground.Foo, copy:@[ExtensionFunctionType] kotlin.Function1<com.javiersc.kotlin.kopy.playground.Foo, kotlin.Unit>) returnType:com.javiersc.kotlin.kopy.playground.Foo [infix]
       annotations:
         KopyOptIn
@@ -704,7 +704,7 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/nest-copy-set.kt
       VALUE_PARAMETER name:number index:0 type:kotlin.Int
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Qux modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Qux modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' type=kotlin.Unit
     FUN GENERATED[com.javiersc.kotlin.kopy.compiler.fir.Key] name:copy visibility:public modality:FINAL <> ($this:com.javiersc.kotlin.kopy.playground.Qux, copy:@[ExtensionFunctionType] kotlin.Function1<com.javiersc.kotlin.kopy.playground.Qux, kotlin.Unit>) returnType:com.javiersc.kotlin.kopy.playground.Qux [infix]
       annotations:
         KopyOptIn