From 16079ce6af3d2c64389d5e9ba3e1ea979169f6ee Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Wed, 21 Dec 2016 12:48:59 +0300 Subject: [PATCH] Moved DescriptorUtils.kt -> descriptors/DescriptorUtils.kt IrUtils.kt -> ir/IrUtils.kt --- .../backend/konan/NativeIrCodegenFactory.kt | 35 ------------------- .../{ => descriptors}/DescriptorUtils.kt | 2 +- .../KonanSharedVariablesManager.kt | 1 - .../kotlin/backend/konan/{ => ir}/IrUtils.kt | 2 +- .../kotlin/backend/konan/llvm/DataLayout.kt | 2 +- .../kotlin/backend/konan/llvm/IrToBitcode.kt | 4 +-- .../kotlin/backend/konan/llvm/LlvmUtils.kt | 2 +- .../backend/konan/llvm/RTTIGenerator.kt | 6 ++-- .../kotlin/backend/konan/lower/Autoboxing.kt | 8 ++--- .../konan/lower/CallableReferenceLowering.kt | 4 ++- .../serialization/KonanSerializerExtension.kt | 2 +- 11 files changed, 17 insertions(+), 51 deletions(-) delete mode 100644 backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/NativeIrCodegenFactory.kt rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/{ => descriptors}/DescriptorUtils.kt (98%) rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/{ => ir}/IrUtils.kt (97%) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/NativeIrCodegenFactory.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/NativeIrCodegenFactory.kt deleted file mode 100644 index 6dd58675e55..00000000000 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/NativeIrCodegenFactory.kt +++ /dev/null @@ -1,35 +0,0 @@ -package org.jetbrains.kotlin.backend.konan - -import org.jetbrains.kotlin.codegen.* -import org.jetbrains.kotlin.codegen.context.PackageContext -import org.jetbrains.kotlin.codegen.state.GenerationState -import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor -import org.jetbrains.kotlin.psi.KtClassOrObject - - -object NativeIrCodegenFactory: CodegenFactory { - override fun createPackageCodegen(state: GenerationState, files: Collection, fqName: org.jetbrains.kotlin.name.FqName, registry: PackagePartRegistry): PackageCodegen { - val impl = PackageCodegenImpl(state, files, fqName, registry) - - - return object : PackageCodegen { - override fun generate(errorHandler: CompilationErrorHandler) { - NativeBackendFacade.doGenerateFiles(files, state, errorHandler) - } - - override fun generateClassOrObject(classOrObject: KtClassOrObject, packagePartContext: PackageContext) { - TODO("not implemented") //To change body of created functions use File | Settings | File Templates. - } - - override fun getPackageFragment(): PackageFragmentDescriptor { - return impl.packageFragment - } - } - TODO("not implemented") //To change body of created functions use File | Settings | File Templates. - } - - override fun createMultifileClassCodegen(state: GenerationState, files: Collection, fqName: org.jetbrains.kotlin.name.FqName, registry: PackagePartRegistry): MultifileClassCodegen { - TODO("not implemented") //To change body of created functions use File | Settings | File Templates. - } -} - diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/DescriptorUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/DescriptorUtils.kt similarity index 98% rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/DescriptorUtils.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/DescriptorUtils.kt index 73e84e621cf..be57e8236d8 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/DescriptorUtils.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/DescriptorUtils.kt @@ -1,4 +1,4 @@ -package org.jetbrains.kotlin.backend.konan +package org.jetbrains.kotlin.backend.konan.descriptors import org.jetbrains.kotlin.backend.konan.KonanBuiltIns import org.jetbrains.kotlin.builtins.isFunctionType diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/KonanSharedVariablesManager.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/KonanSharedVariablesManager.kt index 2be0e3f3b0a..3455b1ea5a0 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/KonanSharedVariablesManager.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/KonanSharedVariablesManager.kt @@ -2,7 +2,6 @@ package org.jetbrains.kotlin.backend.konan.descriptors import org.jetbrains.kotlin.backend.common.descriptors.SharedVariablesManager -import org.jetbrains.kotlin.backend.konan.getKonanInternalClass import org.jetbrains.kotlin.backend.konan.KonanBuiltIns import org.jetbrains.kotlin.descriptors.ClassConstructorDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/IrUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/IrUtils.kt similarity index 97% rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/IrUtils.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/IrUtils.kt index 6d32f25c220..ecc7203d33e 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/IrUtils.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/IrUtils.kt @@ -1,4 +1,4 @@ -package org.jetbrains.kotlin.backend.konan +package org.jetbrains.kotlin.backend.konan.ir import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.ir.* diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/DataLayout.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/DataLayout.kt index 19f29e305a9..86cc3387f0d 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/DataLayout.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/DataLayout.kt @@ -1,7 +1,7 @@ package org.jetbrains.kotlin.backend.konan.llvm import llvm.* -import org.jetbrains.kotlin.backend.konan.isUnboundCallableReference +import org.jetbrains.kotlin.backend.konan.descriptors.isUnboundCallableReference import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.types.KotlinType diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt index 6f62c84595f..7dff7977e30 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt @@ -3,8 +3,8 @@ package org.jetbrains.kotlin.backend.konan.llvm import kotlinx.cinterop.* import llvm.* import org.jetbrains.kotlin.backend.konan.* -import org.jetbrains.kotlin.backend.konan.descriptors.getter2Descriptor -import org.jetbrains.kotlin.backend.konan.descriptors.signature2Descriptor +import org.jetbrains.kotlin.backend.konan.ir.* +import org.jetbrains.kotlin.backend.konan.descriptors.* import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.incremental.components.NoLookupLocation diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt index 23b946ccc9e..f235ef37f37 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt @@ -2,7 +2,7 @@ package org.jetbrains.kotlin.backend.konan.llvm import kotlinx.cinterop.* import llvm.* -import org.jetbrains.kotlin.backend.konan.allValueParameters +import org.jetbrains.kotlin.backend.konan.descriptors.allValueParameters import org.jetbrains.kotlin.backend.konan.KonanPlatform import org.jetbrains.kotlin.descriptors.FunctionDescriptor diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt index 72b9c8498ff..5c6a91b34fd 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt @@ -4,9 +4,9 @@ package org.jetbrains.kotlin.backend.konan.llvm import kotlinx.cinterop.* import llvm.* import org.jetbrains.kotlin.backend.konan.Context -import org.jetbrains.kotlin.backend.konan.implementation -import org.jetbrains.kotlin.backend.konan.implementedInterfaces -import org.jetbrains.kotlin.backend.konan.isInterface +import org.jetbrains.kotlin.backend.konan.descriptors.implementation +import org.jetbrains.kotlin.backend.konan.descriptors.implementedInterfaces +import org.jetbrains.kotlin.backend.konan.descriptors.isInterface import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.name.FqName diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt index 262745c1b42..823dffeec64 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt @@ -3,9 +3,9 @@ package org.jetbrains.kotlin.backend.konan.lower import org.jetbrains.kotlin.backend.common.AbstractValueUsageTransformer import org.jetbrains.kotlin.backend.common.FileLoweringPass import org.jetbrains.kotlin.backend.konan.Context -import org.jetbrains.kotlin.backend.konan.getKonanInternalClass -import org.jetbrains.kotlin.backend.konan.getKonanInternalFunctions -import org.jetbrains.kotlin.backend.konan.unboundCallableReferenceTypeOrNull +import org.jetbrains.kotlin.backend.konan.descriptors.getKonanInternalClass +import org.jetbrains.kotlin.backend.konan.descriptors.getKonanInternalFunctions +import org.jetbrains.kotlin.backend.konan.descriptors.unboundCallableReferenceTypeOrNull import org.jetbrains.kotlin.descriptors.ParameterDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.ir.declarations.IrFile @@ -187,4 +187,4 @@ private class AutoboxingTransformer(val context: Context) : AbstractValueUsageTr }.uncheckedCast(this.type) // Try not to bring new type incompatibilities. } -} \ No newline at end of file +} diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt index dc187c195e7..63a833df72c 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt @@ -2,6 +2,8 @@ package org.jetbrains.kotlin.backend.konan.lower import org.jetbrains.kotlin.backend.common.DeclarationContainerLoweringPass import org.jetbrains.kotlin.backend.konan.* +import org.jetbrains.kotlin.backend.konan.descriptors.* +import org.jetbrains.kotlin.backend.konan.ir.* import org.jetbrains.kotlin.builtins.isFunctionType import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotations @@ -222,4 +224,4 @@ private class CallableReferencesUnbinder(val lower: CallableReferenceLowering, return newDescriptor } -} \ No newline at end of file +} diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanSerializerExtension.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanSerializerExtension.kt index b64b7c4d78a..99b17506492 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanSerializerExtension.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanSerializerExtension.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.backend.konan.serialization import org.jetbrains.kotlin.backend.konan.Context -import org.jetbrains.kotlin.backend.konan.getKonanInternalClass +import org.jetbrains.kotlin.backend.konan.descriptors.getKonanInternalClass import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.KonanLinkData import org.jetbrains.kotlin.descriptors.*