JVM_IR. Remove FileClassDescriptor, no longer used
This commit is contained in:
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.codegen
|
package org.jetbrains.kotlin.codegen
|
||||||
|
|
||||||
import org.jetbrains.kotlin.codegen.descriptors.FileClassDescriptor
|
|
||||||
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
||||||
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
|
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
|
||||||
import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
|
import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
|
||||||
@@ -18,7 +17,7 @@ enum class OwnerKind {
|
|||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
fun getMemberOwnerKind(descriptor: DeclarationDescriptor): OwnerKind = when (descriptor) {
|
fun getMemberOwnerKind(descriptor: DeclarationDescriptor): OwnerKind = when (descriptor) {
|
||||||
is FileClassDescriptor, is PackageFragmentDescriptor -> OwnerKind.PACKAGE
|
is PackageFragmentDescriptor -> OwnerKind.PACKAGE
|
||||||
is ClassDescriptor -> OwnerKind.IMPLEMENTATION
|
is ClassDescriptor -> OwnerKind.IMPLEMENTATION
|
||||||
else -> throw AssertionError("Unexpected declaration container: $this")
|
else -> throw AssertionError("Unexpected declaration container: $this")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
|
||||||
-42
@@ -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<KotlinType>,
|
|
||||||
sourceElement: SourceElement,
|
|
||||||
annotations: Annotations
|
|
||||||
) : FileClassDescriptor, KnownClassDescriptor(
|
|
||||||
name, containingDeclaration, sourceElement,
|
|
||||||
ClassKind.CLASS, Modality.FINAL, Visibilities.PUBLIC,
|
|
||||||
annotations
|
|
||||||
) {
|
|
||||||
init {
|
|
||||||
initialize(emptyList(), supertypes)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun isExternal() = false
|
|
||||||
}
|
|
||||||
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.codegen.FunctionCodegen.isMethodOfAny
|
|||||||
import org.jetbrains.kotlin.codegen.FunctionCodegen.isThereOverriddenInKotlinClass
|
import org.jetbrains.kotlin.codegen.FunctionCodegen.isThereOverriddenInKotlinClass
|
||||||
import org.jetbrains.kotlin.codegen.JvmCodegenUtil.getDirectMember
|
import org.jetbrains.kotlin.codegen.JvmCodegenUtil.getDirectMember
|
||||||
import org.jetbrains.kotlin.codegen.OwnerKind
|
import org.jetbrains.kotlin.codegen.OwnerKind
|
||||||
import org.jetbrains.kotlin.codegen.descriptors.FileClassDescriptor
|
|
||||||
import org.jetbrains.kotlin.codegen.isToArrayFromCollection
|
import org.jetbrains.kotlin.codegen.isToArrayFromCollection
|
||||||
import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
|
import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
|
||||||
import org.jetbrains.kotlin.config.JvmTarget
|
import org.jetbrains.kotlin.config.JvmTarget
|
||||||
|
|||||||
-1
@@ -17,7 +17,6 @@
|
|||||||
package org.jetbrains.kotlin.backend.jvm.lower
|
package org.jetbrains.kotlin.backend.jvm.lower
|
||||||
|
|
||||||
import org.jetbrains.kotlin.backend.common.FileLoweringPass
|
import org.jetbrains.kotlin.backend.common.FileLoweringPass
|
||||||
import org.jetbrains.kotlin.codegen.descriptors.FileClassDescriptor
|
|
||||||
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
||||||
import org.jetbrains.kotlin.ir.IrStatement
|
import org.jetbrains.kotlin.ir.IrStatement
|
||||||
import org.jetbrains.kotlin.ir.declarations.IrClass
|
import org.jetbrains.kotlin.ir.declarations.IrClass
|
||||||
|
|||||||
Reference in New Issue
Block a user