From 2507e2b526ff6b07d011a79efc818a2d57d12fd4 Mon Sep 17 00:00:00 2001 From: Ilmir Usmanov Date: Tue, 24 Dec 2019 14:53:46 +0100 Subject: [PATCH] JVM_IR: Fix parents of $$forInline companions --- .../kotlin/backend/jvm/lower/AddContinuationLowering.kt | 3 +++ .../codegen/boxInline/suspend/stateMachine/innerMadness.kt | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AddContinuationLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AddContinuationLowering.kt index 56db31bc8cc..728938896b2 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AddContinuationLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AddContinuationLowering.kt @@ -537,6 +537,9 @@ private class AddContinuationLowering(private val context: JvmBackendContext) : functionsToAdd.push(mutableSetOf()) val res = super.visitClass(declaration) (res as IrClass).declarations.addAll(functionsToAdd.peek()!!) + for (function in functionsToAdd.peek()!!) { + function.patchDeclarationParents(res) + } functionsToAdd.pop() return res } diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt index b1dcb21189a..f5d47a5e146 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND: JVM_IR -// IGNORE_BACKEND_MULTI_MODULE: JVM_IR // FILE: inlined.kt // COMMON_COROUTINES_TEST // WITH_RUNTIME