From ef72413da97b7e6b47249364ed424c944756e1d3 Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Thu, 26 Aug 2021 15:26:01 +0300 Subject: [PATCH] Revert "JVM_IR: use computeIfAbsent in ClassCodegen.getOrCreate()" This reverts commit 32518eee4b91de7e1202888cc8173482cdbeade3. Reason: the commit causes lockups in ClassCodegen. --- .../org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt index a540f80d405..704cb0eb9f0 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt @@ -511,7 +511,7 @@ class ClassCodegen private constructor( it.origin == JvmLoweredDeclarationOrigin.CLASS_STATIC_INITIALIZER }, ): ClassCodegen = - context.classCodegens.computeIfAbsent(irClass) { ClassCodegen(irClass, context, parentFunction) }.also { + context.classCodegens.getOrPut(irClass) { ClassCodegen(irClass, context, parentFunction) }.also { assert(parentFunction == null || it.parentFunction == parentFunction) { "inconsistent parent function for ${irClass.render()}:\n" + "New: ${parentFunction!!.render()}\n" +