From 07eef9b7518d3264e9be4ea3be78336acdbee446 Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Mon, 9 Aug 2021 17:03:49 +0300 Subject: [PATCH] JVM_IR: double call to adjustDefaultArgumentStubs --- .../jetbrains/kotlin/backend/common/phaser/performByIrFile.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/phaser/performByIrFile.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/phaser/performByIrFile.kt index 7e27aec1325..1d94cb8ccfc 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/phaser/performByIrFile.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/phaser/performByIrFile.kt @@ -121,8 +121,12 @@ private class PerformByIrFilePhase( input.files.clear() input.files.addAll(filesAndStates.map { (irFile, _) -> irFile }.toMutableList()) + // Some remappers in handleDeepCopy depend on entries in remappedFunctions inserted by adjustDefaultArgumentStubs. adjustDefaultArgumentStubs(context, remappedFunctions) context.handleDeepCopy(remappedFiles, remappedClasses, remappedFunctions) + // and some entries in adjustDefaultArgumentStubs depend on those inserted by handleDeepCopy, so we need to repeat the call. + adjustDefaultArgumentStubs(context, remappedFunctions) + input.transformChildrenVoid(CrossFileCallAdjuster(remappedFunctions)) }