From 1aec16ca29f725377bd4021975d857d787d7ed5a Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Sun, 21 Oct 2018 21:24:14 +0300 Subject: [PATCH] JVM_IR. Remove FileClassDescriptor, no longer used --- .../org/jetbrains/kotlin/codegen/OwnerKind.kt | 3 +- .../descriptors/FileClassDescriptor.kt | 21 ---------- .../descriptors/FileClassDescriptorImpl.kt | 42 ------------------- .../backend/jvm/lower/BridgeLowering.kt | 1 - .../jvm/lower/ClassLowerWithContext.kt | 1 - 5 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 compiler/backend/src/org/jetbrains/kotlin/codegen/descriptors/FileClassDescriptor.kt delete mode 100644 compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/FileClassDescriptorImpl.kt diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/OwnerKind.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/OwnerKind.kt index 3791ea86c03..91906fcf8fe 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/OwnerKind.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/OwnerKind.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.codegen -import org.jetbrains.kotlin.codegen.descriptors.FileClassDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor @@ -18,7 +17,7 @@ enum class OwnerKind { companion object { fun getMemberOwnerKind(descriptor: DeclarationDescriptor): OwnerKind = when (descriptor) { - is FileClassDescriptor, is PackageFragmentDescriptor -> OwnerKind.PACKAGE + is PackageFragmentDescriptor -> OwnerKind.PACKAGE is ClassDescriptor -> OwnerKind.IMPLEMENTATION else -> throw AssertionError("Unexpected declaration container: $this") } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/descriptors/FileClassDescriptor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/descriptors/FileClassDescriptor.kt deleted file mode 100644 index 1a156ac4598..00000000000 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/descriptors/FileClassDescriptor.kt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.codegen.descriptors - -import org.jetbrains.kotlin.descriptors.ClassDescriptor - -interface FileClassDescriptor : ClassDescriptor diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/FileClassDescriptorImpl.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/FileClassDescriptorImpl.kt deleted file mode 100644 index f892505f7f7..00000000000 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/FileClassDescriptorImpl.kt +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.backend.jvm.descriptors - -import org.jetbrains.kotlin.backend.common.descriptors.KnownClassDescriptor -import org.jetbrains.kotlin.codegen.descriptors.FileClassDescriptor -import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.kotlin.descriptors.annotations.Annotations -import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.types.KotlinType - -class FileClassDescriptorImpl( - name: Name, - containingDeclaration: PackageFragmentDescriptor, - supertypes: List, - sourceElement: SourceElement, - annotations: Annotations -) : FileClassDescriptor, KnownClassDescriptor( - name, containingDeclaration, sourceElement, - ClassKind.CLASS, Modality.FINAL, Visibilities.PUBLIC, - annotations -) { - init { - initialize(emptyList(), supertypes) - } - - override fun isExternal() = false -} diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt index 8005bd7e22d..7a5bbbd4561 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt @@ -22,7 +22,6 @@ import org.jetbrains.kotlin.codegen.FunctionCodegen.isMethodOfAny import org.jetbrains.kotlin.codegen.FunctionCodegen.isThereOverriddenInKotlinClass import org.jetbrains.kotlin.codegen.JvmCodegenUtil.getDirectMember import org.jetbrains.kotlin.codegen.OwnerKind -import org.jetbrains.kotlin.codegen.descriptors.FileClassDescriptor import org.jetbrains.kotlin.codegen.isToArrayFromCollection import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper import org.jetbrains.kotlin.config.JvmTarget diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ClassLowerWithContext.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ClassLowerWithContext.kt index 872ae227232..c632ad21858 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ClassLowerWithContext.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ClassLowerWithContext.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.backend.jvm.lower import org.jetbrains.kotlin.backend.common.FileLoweringPass -import org.jetbrains.kotlin.codegen.descriptors.FileClassDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.declarations.IrClass