From 994d4e081b993d58f7ee71bf1c94560f8e0958bd Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 12 Nov 2019 18:58:28 +0100 Subject: [PATCH] JVM IR: fix names of monitorenter/monitorexit intrinsics Since they're "illegally" accessed from another file in stdlib, accessors are generated for them, and the calls go through these accessors --- .../kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt index 2a5f8819621..6c15f6b790e 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt @@ -51,13 +51,13 @@ class IrIntrinsicMethods(val irBuiltIns: IrBuiltIns, val symbols: JvmSymbols) { Key( kotlinJvmInternalUnsafe, null, - "monitorEnter", + "access\$monitorEnter\$0", listOf(KotlinBuiltIns.FQ_NAMES.any.toSafe()) ) to MonitorInstruction.MONITOR_ENTER, Key( kotlinJvmInternalUnsafe, null, - "monitorExit", + "access\$monitorExit\$1", listOf(KotlinBuiltIns.FQ_NAMES.any.toSafe()) ) to MonitorInstruction.MONITOR_EXIT, Key(