diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt index 23fdc0ac0a0..ee2d66c3290 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt @@ -237,8 +237,8 @@ class Fir2IrDeclarationStorage( } } - internal fun findIrParent(callableMemberDeclaration: FirCallableMemberDeclaration<*>): IrDeclarationParent? { - val firBasedSymbol = callableMemberDeclaration.symbol + internal fun findIrParent(callableDeclaration: FirCallableDeclaration<*>): IrDeclarationParent? { + val firBasedSymbol = callableDeclaration.symbol val callableId = firBasedSymbol.callableId val parentClassId = callableId.classId return if (parentClassId != null) { @@ -675,7 +675,7 @@ class Fir2IrDeclarationStorage( fun getIrFunctionSymbol(firFunctionSymbol: FirFunctionSymbol<*>): IrFunctionSymbol { val firDeclaration = firFunctionSymbol.fir - val irParent = (firDeclaration as? FirCallableMemberDeclaration<*>)?.let { findIrParent(it) } + val irParent = (firDeclaration as? FirCallableDeclaration<*>)?.let { findIrParent(it) } return when (firDeclaration) { is FirSimpleFunction -> { val irDeclaration = getIrFunction(firDeclaration, irParent, shouldLeaveScope = true).apply { diff --git a/compiler/testData/codegen/box/controlStructures/quicksort.kt b/compiler/testData/codegen/box/controlStructures/quicksort.kt index b784d2dfc1f..381a8cf44bb 100644 --- a/compiler/testData/codegen/box/controlStructures/quicksort.kt +++ b/compiler/testData/codegen/box/controlStructures/quicksort.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR fun IntArray.swap(i:Int, j:Int) { val temp = this[i] this[i] = this[j] diff --git a/compiler/testData/ir/irText/lambdas/extensionLambda.fir.txt b/compiler/testData/ir/irText/lambdas/extensionLambda.fir.txt index ecc5863cc8c..75d4bd06a8c 100644 --- a/compiler/testData/ir/irText/lambdas/extensionLambda.fir.txt +++ b/compiler/testData/ir/irText/lambdas/extensionLambda.fir.txt @@ -11,4 +11,4 @@ FILE fqName: fileName:/extensionLambda.kt $receiver: VALUE_PARAMETER name: type:kotlin.String BLOCK_BODY CALL 'public open fun (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=null - $this: GET_VAR ': kotlin.String declared in .' type=kotlin.String origin=null + $this: GET_VAR ': kotlin.String declared in special.' type=kotlin.String origin=null diff --git a/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.fir.txt b/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.fir.txt index 723f7ea2f18..acc4dfb9da0 100644 --- a/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.fir.txt +++ b/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.fir.txt @@ -109,4 +109,4 @@ FILE fqName: fileName:/multipleImplicitReceivers.kt $receiver: VALUE_PARAMETER name: type:.IInvoke BLOCK_BODY CALL 'public open fun invoke (): kotlin.Int [operator] declared in .IInvoke' type=kotlin.Int origin=null - $this: GET_VAR ': .IInvoke declared in .' type=.IInvoke origin=null + $this: GET_VAR ': .IInvoke declared in special.' type=.IInvoke origin=null diff --git a/compiler/testData/ir/irText/stubs/builtinMap.fir.txt b/compiler/testData/ir/irText/stubs/builtinMap.fir.txt index a0e03c17572..c67b9a74516 100644 --- a/compiler/testData/ir/irText/stubs/builtinMap.fir.txt +++ b/compiler/testData/ir/irText/stubs/builtinMap.fir.txt @@ -27,7 +27,7 @@ FILE fqName: fileName:/builtinMap.kt $receiver: VALUE_PARAMETER name: type:java.util.LinkedHashMap.plus, V1 of .plus> BLOCK_BODY CALL 'public open fun put (p0: K1 of .plus, p1: V1 of .plus): V1 of .plus? [operator] declared in java.util.HashMap' type=V1 of .plus? origin=null - $this: GET_VAR ': java.util.LinkedHashMap.plus, V1 of .plus> declared in .' type=java.util.LinkedHashMap.plus, V1 of .plus> origin=null + $this: GET_VAR ': java.util.LinkedHashMap.plus, V1 of .plus> declared in special.' type=java.util.LinkedHashMap.plus, V1 of .plus> origin=null p0: CALL 'public final fun (): K1 of .plus declared in kotlin.Pair' type=K1 of .plus origin=null $this: GET_VAR 'pair: kotlin.Pair.plus, V1 of .plus> declared in .plus' type=kotlin.Pair.plus, V1 of .plus> origin=null p1: CALL 'public final fun (): V1 of .plus declared in kotlin.Pair' type=V1 of .plus origin=null