diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/DeepCopyIrTreeWithSymbolsForFakeOverrides.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/DeepCopyIrTreeWithSymbolsForFakeOverrides.kt similarity index 98% rename from compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/DeepCopyIrTreeWithSymbolsForFakeOverrides.kt rename to compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/DeepCopyIrTreeWithSymbolsForFakeOverrides.kt index c8632396eea..c2fc5ede737 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/DeepCopyIrTreeWithSymbolsForFakeOverrides.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/DeepCopyIrTreeWithSymbolsForFakeOverrides.kt @@ -1,4 +1,4 @@ -package org.jetbrains.kotlin.backend.common.serialization +package org.jetbrains.kotlin.backend.common.overrides import org.jetbrains.kotlin.backend.common.DescriptorsToIrRemapper import org.jetbrains.kotlin.backend.common.WrappedDescriptorPatcher diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/FakeOverrideChecker.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrideChecker.kt similarity index 98% rename from compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/FakeOverrideChecker.kt rename to compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrideChecker.kt index 3f8bdb4e86e..0c778696575 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/FakeOverrideChecker.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrideChecker.kt @@ -1,4 +1,4 @@ -package org.jetbrains.kotlin.backend.common.override +package org.jetbrains.kotlin.backend.common.overrides import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ClassKind diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/FakeOverrideCopier.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrideCopier.kt similarity index 98% rename from compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/FakeOverrideCopier.kt rename to compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrideCopier.kt index 94e4848b1a1..6394766eef5 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/FakeOverrideCopier.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrideCopier.kt @@ -1,4 +1,4 @@ -package org.jetbrains.kotlin.backend.common.serialization +package org.jetbrains.kotlin.backend.common.overrides import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin import org.jetbrains.kotlin.ir.declarations.IrFunction diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/FakeOverrides.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrides.kt similarity index 98% rename from compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/FakeOverrides.kt rename to compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrides.kt index 8176d6e01e5..13fecd27d5e 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/FakeOverrides.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrides.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.backend.common.serialization +package org.jetbrains.kotlin.backend.common.overrides import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureSerializer import org.jetbrains.kotlin.ir.IrElement @@ -37,6 +37,10 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid import org.jetbrains.kotlin.ir.visitors.acceptVoid +interface FakeOverrideBuilder { + fun buildFakeOverridesForClass(clazz: IrClass) +} + interface PlatformFakeOverrideClassFilter { fun constructFakeOverrides(clazz: IrClass): Boolean = true } diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrOverridingUtil.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrOverridingUtil.kt similarity index 99% rename from compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrOverridingUtil.kt rename to compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrOverridingUtil.kt index b825e51a975..a7f3ed93363 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrOverridingUtil.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrOverridingUtil.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.backend.common.serialization +package org.jetbrains.kotlin.backend.common.overrides import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.Modality diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrTypeCheckerUtils.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrTypeCheckerUtils.kt similarity index 96% rename from compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrTypeCheckerUtils.kt rename to compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrTypeCheckerUtils.kt index fab6d19a7a4..78285f5c7c3 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrTypeCheckerUtils.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrTypeCheckerUtils.kt @@ -1,4 +1,4 @@ -package org.jetbrains.kotlin.backend.common.serialization +package org.jetbrains.kotlin.backend.common.overrides import org.jetbrains.kotlin.ir.declarations.IrTypeParameter import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrVisibilityUtil.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrVisibilityUtil.kt similarity index 97% rename from compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrVisibilityUtil.kt rename to compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrVisibilityUtil.kt index e63999a83e9..33a1b173821 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrVisibilityUtil.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrVisibilityUtil.kt @@ -1,4 +1,4 @@ -package org.jetbrains.kotlin.backend.common.serialization +package org.jetbrains.kotlin.backend.common.overrides import org.jetbrains.kotlin.backend.common.lower.parents import org.jetbrains.kotlin.descriptors.Visibilities diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt index e39c9a9fd7d..bf33e24c437 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.backend.common.serialization import org.jetbrains.kotlin.backend.common.LoggingContext import org.jetbrains.kotlin.backend.common.ir.ir2string +import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideControl import org.jetbrains.kotlin.backend.common.serialization.encodings.* import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.ir.IrElement diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt index 2465d2efb97..6097cf0629b 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt @@ -7,6 +7,8 @@ package org.jetbrains.kotlin.backend.common.serialization import org.jetbrains.kotlin.backend.common.LoggingContext import org.jetbrains.kotlin.backend.common.ir.isExpect +import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideBuilderImpl +import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideControl import org.jetbrains.kotlin.backend.common.serialization.encodings.BinarySymbolData import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.impl.EmptyPackageFragmentDescriptor @@ -662,8 +664,4 @@ enum class DeserializationStrategy( EXPLICITLY_EXPORTED(true, true, false, true), ONLY_DECLARATION_HEADERS(false, false, false, false), WITH_INLINE_BODIES(false, false, false, true) -} - -interface FakeOverrideBuilder { - fun buildFakeOverridesForClass(clazz: IrClass) -} +} \ No newline at end of file diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt index 7a47731d226..d009323c0a3 100644 --- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt +++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt @@ -14,8 +14,8 @@ import org.jetbrains.kotlin.backend.common.LoggingContext import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext import org.jetbrains.kotlin.backend.common.extensions.IrPluginContextImpl +import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideChecker import org.jetbrains.kotlin.backend.common.serialization.DeserializationStrategy -import org.jetbrains.kotlin.backend.common.serialization.FakeOverrideChecker import org.jetbrains.kotlin.backend.common.serialization.KlibIrVersion import org.jetbrains.kotlin.backend.common.serialization.knownBuiltins import org.jetbrains.kotlin.backend.common.serialization.mangle.ManglerChecker diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt index f482fa857a9..33927b96b92 100644 --- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt +++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir import org.jetbrains.kotlin.backend.common.LoggingContext +import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideBuilderImpl import org.jetbrains.kotlin.backend.common.serialization.* import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureSerializer import org.jetbrains.kotlin.descriptors.ModuleDescriptor diff --git a/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/ir/backend/jvm/serialization/JvmIrLinker.kt b/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/ir/backend/jvm/serialization/JvmIrLinker.kt index 5f67c1b8a53..bf897c5c0a2 100644 --- a/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/ir/backend/jvm/serialization/JvmIrLinker.kt +++ b/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/ir/backend/jvm/serialization/JvmIrLinker.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.ir.backend.jvm.serialization import org.jetbrains.kotlin.backend.common.LoggingContext +import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideBuilderImpl import org.jetbrains.kotlin.backend.common.serialization.* import org.jetbrains.kotlin.backend.common.serialization.encodings.BinarySymbolData import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureSerializer