diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/CachedSyntheticDeclarations.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/SyntheticAccessorGenerator.kt similarity index 98% rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/CachedSyntheticDeclarations.kt rename to compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/SyntheticAccessorGenerator.kt index 84ec730e606..dcdc61b8043 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/CachedSyntheticDeclarations.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/SyntheticAccessorGenerator.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2024 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. */ -package org.jetbrains.kotlin.backend.jvm +package org.jetbrains.kotlin.backend.common.lower.inline import org.jetbrains.kotlin.backend.common.BackendContext import org.jetbrains.kotlin.backend.common.ScopeWithIr @@ -33,7 +33,7 @@ import java.util.concurrent.ConcurrentHashMap * accessors on KLIB-based backends ([KT-64865](https://youtrack.jetbrains.com/issue/KT-64865)). * Please consider this fact when you want to change its implementation. */ -open class CachedSyntheticDeclarations(protected val context: Context) { +open class SyntheticAccessorGenerator(protected val context: Context) { private data class FieldKey(val fieldSymbol: IrFieldSymbol, val parent: IrDeclarationParent, val superQualifierSymbol: IrClassSymbol?) private data class FunctionKey( diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmSyntheticAccessorGenerator.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmSyntheticAccessorGenerator.kt index db177767c1b..cdb5f960679 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmSyntheticAccessorGenerator.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmSyntheticAccessorGenerator.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.backend.jvm import org.jetbrains.kotlin.backend.common.ScopeWithIr +import org.jetbrains.kotlin.backend.common.lower.inline.SyntheticAccessorGenerator import org.jetbrains.kotlin.backend.jvm.ir.isJvmInterface import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.descriptors.DescriptorVisibilities @@ -19,7 +20,7 @@ import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.org.objectweb.asm.Opcodes import java.util.concurrent.ConcurrentHashMap -class JvmSyntheticAccessorGenerator(context: JvmBackendContext) : CachedSyntheticDeclarations(context) { +class JvmSyntheticAccessorGenerator(context: JvmBackendContext) : SyntheticAccessorGenerator(context) { override fun accessorModality(parent: IrDeclarationParent): Modality = if (parent is IrClass && parent.isJvmInterface) Modality.OPEN else Modality.FINAL