From ef94716af570703a6d32560cb510ae3ff6fd8feb Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 6 Jul 2020 23:06:50 +0200 Subject: [PATCH] IR: remove deprecated constructor of IrFieldImpl --- .../generators/DelegatedPropertyGenerator.kt | 5 +++- .../ir/declarations/impl/IrFieldImpl.kt | 25 +++---------------- .../jetbrains/kotlin/ir/util/SymbolTable.kt | 9 +++---- .../compiler/backend/ir/GeneratorHelpers.kt | 13 ++++++---- 4 files changed, 18 insertions(+), 34 deletions(-) diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DelegatedPropertyGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DelegatedPropertyGenerator.kt index fd624f854d9..80d80736b13 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DelegatedPropertyGenerator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DelegatedPropertyGenerator.kt @@ -133,7 +133,10 @@ class DelegatedPropertyGenerator(declarationGenerator: DeclarationGenerator) : D context.symbolTable.declareField( startOffset, endOffset, origin, delegateDescriptor, type ) { - IrFieldImpl(startOffset, endOffset, origin, delegateDescriptor, type, symbol = it).apply { + IrFieldImpl( + startOffset, endOffset, origin, it, delegateDescriptor.name, type, delegateDescriptor.visibility, + !delegateDescriptor.isVar, false, delegateDescriptor.dispatchReceiverParameter == null + ).apply { metadata = MetadataSource.Property(propertyDescriptor) } }.also { irDelegate -> diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt index 7e1e4e13e70..49edc85ef76 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt @@ -19,18 +19,17 @@ package org.jetbrains.kotlin.ir.declarations.impl import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI -import org.jetbrains.kotlin.ir.declarations.* +import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin +import org.jetbrains.kotlin.ir.declarations.IrField +import org.jetbrains.kotlin.ir.declarations.MetadataSource import org.jetbrains.kotlin.ir.declarations.impl.carriers.FieldCarrier import org.jetbrains.kotlin.ir.expressions.IrExpressionBody import org.jetbrains.kotlin.ir.symbols.IrFieldSymbol import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol -import org.jetbrains.kotlin.ir.symbols.impl.IrFieldSymbolImpl import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.ir.visitors.IrElementTransformer import org.jetbrains.kotlin.ir.visitors.IrElementVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyExternal - class IrFieldImpl( startOffset: Int, @@ -47,24 +46,6 @@ class IrFieldImpl( IrField, FieldCarrier { - constructor( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - descriptor: PropertyDescriptor, - type: IrType, - name: Name = descriptor.name, - symbol: IrFieldSymbol = IrFieldSymbolImpl(descriptor), - visibility: Visibility = descriptor.visibility - ) : this( - startOffset, endOffset, origin, symbol, - name = name, type, - visibility = visibility, - isFinal = !descriptor.isVar, - isExternal = descriptor.isEffectivelyExternal(), - isStatic = descriptor.dispatchReceiverParameter == null - ) - init { symbol.bind(this) } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt index 7585c83fe34..693ac26248c 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt @@ -582,12 +582,9 @@ open class SymbolTable( visibility: Visibility? = null, fieldFactory: (IrFieldSymbol) -> IrField = { IrFieldImpl( - startOffset, endOffset, origin, - name = nameProvider.nameForDeclaration(descriptor), - type = type, - descriptor = descriptor, - symbol = it, - visibility = visibility ?: it.descriptor.visibility, + startOffset, endOffset, origin, it, nameProvider.nameForDeclaration(descriptor), type, + visibility ?: it.descriptor.visibility, !it.descriptor.isVar, it.descriptor.isEffectivelyExternal(), + it.descriptor.dispatchReceiverParameter == null ).apply { metadata = MetadataSource.Property(it.descriptor) } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/GeneratorHelpers.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/GeneratorHelpers.kt index e86207b2b07..e49c1e1e130 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/GeneratorHelpers.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/GeneratorHelpers.kt @@ -26,6 +26,7 @@ import org.jetbrains.kotlin.js.resolve.diagnostics.findPsi import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.descriptorUtil.classId import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe +import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyExternal import org.jetbrains.kotlin.resolve.descriptorUtil.module import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.types.typeUtil.isTypeParameter @@ -259,16 +260,18 @@ interface IrBuilderExtension { } private fun generatePropertyBackingField( - propertyDescriptor: PropertyDescriptor, + descriptor: PropertyDescriptor, originProperty: IrProperty ): IrField { - val fieldSymbol = compilerContext.symbolTable.referenceField(propertyDescriptor) - + val fieldSymbol = compilerContext.symbolTable.referenceField(descriptor) if (fieldSymbol.isBound) return fieldSymbol.owner - return originProperty.run { + return with(descriptor) { // TODO: type parameters - IrFieldImpl(startOffset, endOffset, SERIALIZABLE_PLUGIN_ORIGIN, propertyDescriptor, propertyDescriptor.type.toIrType(), symbol = fieldSymbol) + IrFieldImpl( + originProperty.startOffset, originProperty.endOffset, SERIALIZABLE_PLUGIN_ORIGIN, fieldSymbol, name, type.toIrType(), + visibility, !isVar, isEffectivelyExternal(), dispatchReceiverParameter == null + ) } }