[Psi2Ir] Replace custom IrProperty node with common one

2021-07-02 16:32:15 +03:00
parent 4d5186d332
commit d472b6c71c
2 changed files with 24 additions and 72 deletions
@@ -18,9 +18,11 @@ package org.jetbrains.kotlin.psi2ir.generators

 import org.jetbrains.kotlin.builtins.*
 import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
-import org.jetbrains.kotlin.ir.declarations.*
+import org.jetbrains.kotlin.ir.declarations.DescriptorMetadataSource
+import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
+import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
+import org.jetbrains.kotlin.ir.declarations.IrValueParameter
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.*
@@ -430,73 +432,6 @@ class ReflectionReferencesGenerator(statementGenerator: StatementGenerator) : St
        val setterSymbol: IrSimpleFunctionSymbol?
    )

-    private class IrSyntheticJavaProperty(
-        @property:ObsoleteDescriptorBasedAPI
-        override val descriptor: SyntheticJavaPropertyDescriptor,
-        override val symbol: IrPropertySymbol,
-        private val getterSymbol: IrSimpleFunctionSymbol,
-        private val setterSymbol: IrSimpleFunctionSymbol?,
-        override val factory: IrFactory
-    ) : IrProperty() {
-
-        init {
-            symbol.bind(this)
-        }
-
-        override val isVar: Boolean
-            get() = descriptor.isVar
-        override val isConst: Boolean
-            get() = descriptor.isConst
-        override val isLateinit: Boolean
-            get() = descriptor.isLateInit
-        override val isDelegated: Boolean
-            get() = descriptor.isDelegated
-        override val isExpect: Boolean
-            get() = descriptor.isExpect
-        override val isFakeOverride: Boolean
-            get() = false
-        override var overriddenSymbols: List<IrPropertySymbol>
-            get() = emptyList()
-            set(_) {}
-        override var backingField: IrField?
-            get() = null
-            set(_) {}
-        override var getter: IrSimpleFunction?
-            get() = getterSymbol.owner.also { it.correspondingPropertySymbol = symbol }
-            set(_) {}
-        override var setter: IrSimpleFunction?
-            get() = setterSymbol?.owner?.also { it.correspondingPropertySymbol = symbol }
-            set(_) {}
-        override val startOffset: Int
-            get() = UNDEFINED_OFFSET
-        override val endOffset: Int
-            get() = UNDEFINED_OFFSET
-        override var origin: IrDeclarationOrigin
-            get() = IrDeclarationOrigin.SYNTHETIC_JAVA_PROPERTY_DELEGATE
-            set(_) {}
-        override var parent: IrDeclarationParent
-            get() = getterSymbol.owner.parent
-            set(_) {}
-        override var annotations: List<IrConstructorCall>
-            get() = emptyList()
-            set(_) {}
-        override val isExternal: Boolean
-            get() = descriptor.isExternal
-        override val name: Name
-            get() = descriptor.name
-        override val modality: Modality
-            get() = descriptor.modality
-        override var visibility: DescriptorVisibility
-            get() = descriptor.visibility
-            set(_) {}
-        override var metadata: MetadataSource? = DescriptorMetadataSource.Property(descriptor)
-        override var attributeOwnerId: IrAttributeContainer
-            get() = this
-            set(_) {}
-        override val containerSource: DeserializedContainerSource?
-            get() = null
-    }
-
    private fun resolvePropertySymbol(descriptor: PropertyDescriptor, mutable: Boolean): DelegatedPropertySymbols {
        val symbol = context.symbolTable.referenceProperty(descriptor)
        val syntheticJavaProperty = context.extensions.unwrapSyntheticJavaProperty(descriptor)
@@ -512,7 +447,24 @@ class ReflectionReferencesGenerator(statementGenerator: StatementGenerator) : St
            if (!symbol.isBound) {
                val offset = UNDEFINED_OFFSET
                context.symbolTable.declareProperty(offset, offset, IrDeclarationOrigin.SYNTHETIC_JAVA_PROPERTY_DELEGATE, descriptor) {
-                    IrSyntheticJavaProperty(descriptor, it, getterSymbol, setterSymbol, context.irFactory)
+                    context.irFactory.createProperty(
+                        offset,
+                        offset,
+                        IrDeclarationOrigin.SYNTHETIC_JAVA_PROPERTY_DELEGATE,
+                        symbol,
+                        descriptor.name,
+                        descriptor.visibility,
+                        descriptor.modality,
+                        descriptor.isVar,
+                        descriptor.isConst,
+                        descriptor.isLateInit,
+                        descriptor.isDelegated,
+                        descriptor.isExternal,
+                        descriptor.isExpect,
+                        isFakeOverride = false
+                    ).also {
+                        it.parent = scope.getLocalDeclarationParent()
+                    }
                }
            }
            return DelegatedPropertySymbols(symbol, getterSymbol, setterSymbol)
@@ -2,7 +2,7 @@ FILE fqName:k fileName:/box.kt
  PROPERTY name:p1 visibility:public modality:FINAL [delegated,var]
    FIELD PROPERTY_DELEGATE name:p1$delegate type:kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> visibility:private [final,static]
      EXPRESSION_BODY
-        PROPERTY_REFERENCE 'public final foo: @[FlexibleNullability] kotlin.String? [var]' field=null getter='public open fun getFoo (): @[FlexibleNullability] kotlin.String? declared in <root>.J' setter='public open fun setFoo (s: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in <root>.J' type=kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> origin=null
+        PROPERTY_REFERENCE 'public final foo [var]' field=null getter='public open fun getFoo (): @[FlexibleNullability] kotlin.String? declared in <root>.J' setter='public open fun setFoo (s: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in <root>.J' type=kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> origin=null
          $receiver: CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.J' type=<root>.J origin=null
    FUN DELEGATED_PROPERTY_ACCESSOR name:<get-p1> visibility:public modality:FINAL <> () returnType:@[FlexibleNullability] kotlin.String?
      correspondingProperty: PROPERTY name:p1 visibility:public modality:FINAL [delegated,var]
@@ -27,7 +27,7 @@ FILE fqName:k fileName:/box.kt
  PROPERTY name:p2 visibility:public modality:FINAL [delegated,var]
    FIELD PROPERTY_DELEGATE name:p2$delegate type:kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> visibility:private [final,static]
      EXPRESSION_BODY
-        PROPERTY_REFERENCE 'public final foo: @[FlexibleNullability] kotlin.String? [var]' field=null getter='public open fun getFoo (): @[FlexibleNullability] kotlin.String? declared in <root>.J' setter='public open fun setFoo (s: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in <root>.J' type=kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> origin=null
+        PROPERTY_REFERENCE 'public final foo [var]' field=null getter='public open fun getFoo (): @[FlexibleNullability] kotlin.String? declared in <root>.J' setter='public open fun setFoo (s: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in <root>.J' type=kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> origin=null
          $receiver: CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.J' type=<root>.J origin=null
    FUN DELEGATED_PROPERTY_ACCESSOR name:<get-p2> visibility:public modality:FINAL <> () returnType:@[FlexibleNullability] kotlin.String?
      correspondingProperty: PROPERTY name:p2 visibility:public modality:FINAL [delegated,var]