diff --git a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt index ef4955b177d..b0db9682edd 100644 --- a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt +++ b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt @@ -360,7 +360,7 @@ internal fun generateIncrementOrDecrementBlock( val resultName = Name.special("") val resultInitializer = FirFunctionCallImpl(session, baseExpression).apply { this.calleeReference = FirSimpleNamedReference(session, baseExpression.operationReference, callName) - this.arguments += generateAccessExpression(session, baseExpression, tempName) + this.explicitReceiver = generateAccessExpression(session, baseExpression, tempName) } val resultVar = generateTemporaryVariable(session, baseExpression, resultName, resultInitializer) val assignment = argument.generateAssignment( diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt index 7cebcfa9dc8..b3d786a1b22 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt @@ -32,7 +32,7 @@ FILE: destructuring.kt lvar y: = #.component2() lvar z: String = #.component3() lval : = x# - x# = inc#(#) + x# = #.inc#() # y# *= Double(2.0) z# = String() diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt index e857ff40d2c..c95de571cb8 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt @@ -3,25 +3,25 @@ FILE: unary.kt lvar x: = Int(0) lval x1: = { lval : = x# - x# = inc#(#) + x# = #.inc#() # } lval x2: = { lval : = x# - x# = inc#(#) + x# = #.inc#() x# } lval x3: = { lval : = x# - x# = dec#(#) + x# = #.dec#() x# } lval x4: = { lval : = x# - x# = dec#(#) + x# = #.dec#() # } @@ -46,13 +46,13 @@ FILE: unary.kt public? final? fun test2(x: X): kotlin/Unit { lval x1: = { lval : = x#.i# - x#.i# = inc#(#) + x#.i# = #.inc#() # } lval x2: = { lval : = x#.i# - lval : = inc#(#) + lval : = #.inc#() x#.i# = # # } @@ -61,13 +61,13 @@ FILE: unary.kt public? final? fun test3(arr: Array): kotlin/Unit { lval x1: = { lval : = arr#.get#(Int(0)) - arr#.set#(Int(0), inc#(#)) + arr#.set#(Int(0), #.inc#()) # } lval x2: = { lval : = arr#.get#(Int(1)) - lval : = inc#(#) + lval : = #.inc#() arr#.set#(Int(1), #) # } @@ -85,13 +85,13 @@ FILE: unary.kt public? final? fun test4(y: Y): kotlin/Unit { lval x1: = { lval : = y#.arr#.get#(Int(0)) - y#.arr#.set#(Int(0), inc#(#)) + y#.arr#.set#(Int(0), #.inc#()) # } lval x2: = { lval : = y#.arr#.get#(Int(1)) - lval : = inc#(#) + lval : = #.inc#() y#.arr#.set#(Int(1), #) # } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/while.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/while.txt index e9bcc14c6f0..c960ba73128 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/while.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/while.txt @@ -3,12 +3,12 @@ FILE: while.kt lvar k: = Int(0) some@while(<(k#, limit#)) { lval : = k# - k# = inc#(#) + k# = #.inc#() # println#(k#) while(==(k#, Int(13))) { lval : = k# - k# = inc#(#) + k# = #.inc#() # when () { <(k#, limit#) -> { @@ -35,7 +35,7 @@ FILE: while.kt lvar k: = limit# do { lval : = k# - k# = dec#(#) + k# = #.dec#() # println#(k#) }