From ee6586fe4f2132efe328498fa58ec6ca60897b1e Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 14 May 2021 12:22:58 +0200 Subject: [PATCH] Fix accidental usage of ASM from jdk.internal #KT-46402 Fixed --- .../codegen/inline/coroutines/CoroutineTransformer.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/coroutines/CoroutineTransformer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/coroutines/CoroutineTransformer.kt index c2c3e5b12cd..c8e72fd19c2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/coroutines/CoroutineTransformer.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/coroutines/CoroutineTransformer.kt @@ -2,11 +2,10 @@ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -@file:Suppress("JAVA_MODULE_DOES_NOT_EXPORT_PACKAGE") + package org.jetbrains.kotlin.codegen.inline.coroutines import com.intellij.util.ArrayUtil -import jdk.internal.org.objectweb.asm.Type import org.jetbrains.kotlin.codegen.ClassBuilder import org.jetbrains.kotlin.codegen.coroutines.* import org.jetbrains.kotlin.codegen.inline.* @@ -20,6 +19,7 @@ import org.jetbrains.kotlin.resolve.jvm.AsmTypes import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin import org.jetbrains.org.objectweb.asm.MethodVisitor import org.jetbrains.org.objectweb.asm.Opcodes +import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.tree.* import org.jetbrains.org.objectweb.asm.tree.analysis.BasicInterpreter import org.jetbrains.org.objectweb.asm.tree.analysis.BasicValue @@ -287,4 +287,4 @@ private class CapturedLambdaInterpreter : BasicInterpreter(Opcodes.API_VERSION) override fun merge(v: BasicValue?, w: BasicValue?): BasicValue? = if (v is PossibleLambdaLoad && w is PossibleLambdaLoad && v.insn == w.insn) v else super.merge(v, w) -} \ No newline at end of file +}