From f85538129d652189b63ce93d8bd2a66b0a7eb036 Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Mon, 9 Jan 2017 14:50:53 +0700 Subject: [PATCH] backend: introduce common backend context --- .../kotlin/backend/common/BackendContext.kt | 27 ++++++++++++++++ .../descriptors/SharedVariablesManager.kt | 31 +++++++++++++++++++ .../kotlin/backend/jvm/JvmBackendContext.kt | 9 +++--- .../jvm/descriptors/SharedVariablesManager.kt | 8 +---- 4 files changed, 64 insertions(+), 11 deletions(-) create mode 100644 compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/BackendContext.kt create mode 100644 compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/descriptors/SharedVariablesManager.kt diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/BackendContext.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/BackendContext.kt new file mode 100644 index 00000000000..84de73794cb --- /dev/null +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/BackendContext.kt @@ -0,0 +1,27 @@ +/* + * 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.backend.common + +import org.jetbrains.kotlin.backend.common.descriptors.SharedVariablesManager +import org.jetbrains.kotlin.builtins.KotlinBuiltIns +import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns + +interface BackendContext { + val builtIns: KotlinBuiltIns + val irBuiltIns: IrBuiltIns + val sharedVariablesManager: SharedVariablesManager +} diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/descriptors/SharedVariablesManager.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/descriptors/SharedVariablesManager.kt new file mode 100644 index 00000000000..05b0c0b5384 --- /dev/null +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/descriptors/SharedVariablesManager.kt @@ -0,0 +1,31 @@ +/* + * 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.backend.common.descriptors + +import org.jetbrains.kotlin.descriptors.VariableDescriptor +import org.jetbrains.kotlin.ir.IrStatement +import org.jetbrains.kotlin.ir.declarations.IrVariable +import org.jetbrains.kotlin.ir.expressions.IrExpression +import org.jetbrains.kotlin.ir.expressions.IrGetValue +import org.jetbrains.kotlin.ir.expressions.IrSetVariable + +interface SharedVariablesManager { + fun createSharedVariableDescriptor(variableDescriptor: VariableDescriptor): VariableDescriptor + fun defineSharedValue(sharedVariableDescriptor: VariableDescriptor, originalDeclaration: IrVariable): IrStatement + fun getSharedValue(sharedVariableDescriptor: VariableDescriptor, originalGet: IrGetValue): IrExpression + fun setSharedValue(sharedVariableDescriptor: VariableDescriptor, originalSet: IrSetVariable): IrExpression +} \ No newline at end of file diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendContext.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendContext.kt index d87a1df5834..bc8f2246390 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendContext.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendContext.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.backend.jvm +import org.jetbrains.kotlin.backend.common.BackendContext import org.jetbrains.kotlin.backend.jvm.descriptors.JvmSharedVariablesManager import org.jetbrains.kotlin.backend.jvm.descriptors.SpecialDescriptorsFactory import org.jetbrains.kotlin.codegen.state.GenerationState @@ -25,9 +26,9 @@ import org.jetbrains.kotlin.psi2ir.PsiSourceManager class JvmBackendContext( val state: GenerationState, val psiSourceManager: PsiSourceManager, - val irBuiltIns: IrBuiltIns -) { - val builtIns = state.module.builtIns + override val irBuiltIns: IrBuiltIns +) : BackendContext { + override val builtIns = state.module.builtIns val specialDescriptorsFactory = SpecialDescriptorsFactory(psiSourceManager, builtIns) - val sharedVariablesManager = JvmSharedVariablesManager(builtIns) + override val sharedVariablesManager = JvmSharedVariablesManager(builtIns) } diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/SharedVariablesManager.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/SharedVariablesManager.kt index 983f1b490cd..34b7d96b511 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/SharedVariablesManager.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/SharedVariablesManager.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.backend.jvm.descriptors +import org.jetbrains.kotlin.backend.common.descriptors.SharedVariablesManager import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.PrimitiveType import org.jetbrains.kotlin.descriptors.* @@ -35,13 +36,6 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.types.* -interface SharedVariablesManager { - fun createSharedVariableDescriptor(variableDescriptor: VariableDescriptor): VariableDescriptor - fun defineSharedValue(sharedVariableDescriptor: VariableDescriptor, originalDeclaration: IrVariable): IrStatement - fun getSharedValue(sharedVariableDescriptor: VariableDescriptor, originalGet: IrGetValue): IrExpression - fun setSharedValue(sharedVariableDescriptor: VariableDescriptor, originalSet: IrSetVariable): IrExpression -} - class JvmSharedVariablesManager(val builtIns: KotlinBuiltIns) : SharedVariablesManager { private val kotlinJvmInternalPackage = KnownPackageFragmentDescriptor(builtIns.builtInsModule, FqName("kotlin.jvm.internal")) private val refNamespaceClass = KnownClassDescriptor.createClass(Name.identifier("Ref"), kotlinJvmInternalPackage, listOf(builtIns.anyType))