From ab455d6572fbfede3f0270c5ad77f1080aa40618 Mon Sep 17 00:00:00 2001
From: Dmitry Petrov <dmitry.petrov@jetbrains.com>
Date: Thu, 24 May 2018 16:47:25 +0300
Subject: [PATCH] IR: IrSimpleFunction.correspondingProperty: IrProperty?

Non-null for a property accessor, points to a corresponding property.
---
 .../psi2ir/generators/ClassGenerator.kt       |  6 ++-
 .../psi2ir/generators/DeclarationGenerator.kt |  2 +-
 .../generators/DelegatedPropertyGenerator.kt  |  2 +-
 .../psi2ir/generators/FunctionGenerator.kt    |  6 +--
 .../psi2ir/generators/PropertyGenerator.kt    |  5 +--
 .../kotlin/ir/declarations/IrProperty.kt      |  4 +-
 .../ir/declarations/IrSimpleFunction.kt       |  8 +++-
 .../ir/declarations/impl/IrFunctionImpl.kt    |  3 ++
 .../ir/declarations/impl/IrPropertyImpl.kt    | 12 +++---
 .../jetbrains/kotlin/ir/util/DumpIrTree.kt    |  1 +
 .../org/jetbrains/kotlin/ir/util/IrUtils.kt   |  2 +-
 .../kotlin/ir/util/PatchDeclarationParents.kt |  8 ++++
 .../ir/irText/classes/abstractMembers.txt     |  6 +++
 .../ir/irText/classes/annotationClasses.txt   |  4 ++
 ...tReorderingInDelegatingConstructorCall.txt |  6 +++
 .../ir/irText/classes/classMembers.txt        |  8 ++++
 .../testData/ir/irText/classes/classes.txt    |  2 +
 .../classes/dataClassWithArrayMembers.txt     | 11 +++++
 .../ir/irText/classes/dataClasses.txt         |  8 ++++
 .../ir/irText/classes/dataClassesGeneric.txt  |  1 +
 .../classes/delegatedImplementation.txt       | 18 ++++++++
 ...gConstructorCallToTypeAliasConstructor.txt |  3 ++
 compiler/testData/ir/irText/classes/enum.txt  | 22 ++++++++++
 .../irText/classes/enumWithSecondaryCtor.txt  | 15 +++++++
 .../testData/ir/irText/classes/initBlock.txt  |  1 +
 .../testData/ir/irText/classes/initVal.txt    |  3 ++
 .../testData/ir/irText/classes/initVar.txt    | 12 ++++++
 .../innerClassWithDelegatingConstructor.txt   |  1 +
 .../lambdaInDataClassDefaultParameter.txt     |  2 +
 .../classes/objectLiteralExpressions.txt      |  2 +
 .../irText/classes/objectWithInitializers.txt |  2 +
 .../ir/irText/classes/primaryConstructor.txt  |  6 +++
 ...aryConstructorWithSuperConstructorCall.txt |  2 +
 .../ir/irText/classes/qualifiedSuperCalls.txt |  3 ++
 .../ir/irText/classes/sealedClasses.txt       |  3 ++
 ...nstructorWithInitializersFromClassBody.txt |  2 +
 .../testData/ir/irText/classes/superCalls.txt |  2 +
 .../annotationsInAnnotationArguments.txt      |  3 ++
 .../annotationsWithDefaultParameterValues.txt |  2 +
 .../annotationsWithVarargParameters.txt       |  1 +
 .../arrayInAnnotationArguments.txt            |  2 +
 .../annotations/classLiteralInAnnotation.txt  |  4 ++
 .../annotations/classesWithAnnotations.txt    |  3 ++
 .../constExpressionsInAnnotationArguments.txt |  2 +
 .../constructorsWithAnnotations.txt           |  1 +
 .../delegateFieldWithAnnotations.txt          |  1 +
 ...egatedPropertyAccessorsWithAnnotations.txt |  6 +++
 .../enumEntriesWithAnnotations.txt            |  6 +++
 .../enumsInAnnotationArguments.txt            |  3 ++
 .../annotations/fieldsWithAnnotations.txt     |  5 +++
 .../annotations/fileAnnotations.txt           |  1 +
 .../annotations/functionsWithAnnotations.txt  |  1 +
 ...ocalDelegatedPropertiesWithAnnotations.txt |  1 +
 ...aryConstructorParameterWithAnnotations.txt |  1 +
 .../annotations/propertiesWithAnnotations.txt |  2 +
 ...ccessorsFromClassHeaderWithAnnotations.txt |  5 +++
 .../propertyAccessorsWithAnnotations.txt      |  8 ++++
 ...propertySetterParameterWithAnnotations.txt |  5 +++
 .../receiverParameterWithAnnotations.txt      |  2 +
 .../spreadOperatorInAnnotationArguments.txt   |  1 +
 .../typeAliasesWithAnnotations.txt            |  1 +
 .../valueParametersWithAnnotations.txt        |  2 +
 .../varargsInAnnotationArguments.txt          |  3 ++
 .../annotations/variablesWithAnnotations.txt  |  1 +
 .../catchParameterInTopLevelProperty.txt      |  1 +
 .../declarations/classLevelProperties.txt     | 12 ++++++
 .../declarations/delegatedProperties.txt      |  7 ++++
 .../declarations/extensionProperties.txt      |  6 +++
 .../ir/irText/declarations/fakeOverrides.txt  |  2 +
 .../declarations/fileWithAnnotations.txt      |  1 +
 .../declarations/interfaceProperties.txt      |  6 +++
 .../declarations/localClassWithOverrides.txt  |  6 +++
 ...lDelegatedPropertyWithSuspendOperators.txt |  2 +
 .../multiplatform/expectedEnumClass.txt       |  4 ++
 .../declarations/packageLevelProperties.txt   | 12 ++++++
 .../declarations/parameters/constructor.txt   |  7 ++++
 .../parameters/dataClassMembers.txt           |  2 +
 .../parameters/defaultPropertyAccessors.txt   |  9 ++++
 .../parameters/delegatedMembers.txt           |  2 +
 .../declarations/parameters/lambdas.txt       |  4 ++
 .../parameters/propertyAccessors.txt          | 18 ++++++++
 .../parameters/typeParameterBeforeBound.txt   |  2 +
 .../primaryCtorDefaultArguments.txt           |  1 +
 .../declarations/primaryCtorProperties.txt    |  3 ++
 .../provideDelegate/differentReceivers.txt    |  4 ++
 .../declarations/provideDelegate/local.txt    |  2 +
 .../localDifferentReceivers.txt               |  1 +
 .../declarations/provideDelegate/member.txt   |  3 ++
 .../provideDelegate/memberExtension.txt       |  3 ++
 .../declarations/provideDelegate/topLevel.txt |  3 ++
 .../ir/irText/errors/unresolvedReference.txt  |  4 ++
 .../ir/irText/expressions/arrayAccess.txt     |  1 +
 .../expressions/arrayAugmentedAssignment1.txt |  1 +
 .../ir/irText/expressions/assignments.txt     |  2 +
 .../expressions/augmentedAssignment1.txt      |  2 +
 .../expressions/augmentedAssignment2.txt      |  1 +
 .../expressions/boundCallableReferences.txt   |  4 ++
 .../callableRefToGenericMember.txt            |  3 ++
 .../callableReferenceToImportedFromObject.txt |  5 +++
 .../expressions/castToTypeParameter.txt       |  3 ++
 .../ir/irText/expressions/coercionToUnit.txt  |  1 +
 .../complexAugmentedAssignment.txt            |  8 ++++
 .../ir/irText/expressions/contructorCall.txt  |  1 +
 .../testData/ir/irText/expressions/elvis.txt  |  1 +
 .../expressions/enumEntryAsReceiver.txt       |  7 ++++
 .../extensionPropertyGetterCall.txt           |  1 +
 .../testData/ir/irText/expressions/field.txt  |  4 ++
 .../expressions/forWithImplicitReceivers.txt  |  2 +
 .../expressions/genericPropertyCall.txt       |  2 +
 .../implicitCastToTypeParameter.txt           |  1 +
 .../irText/expressions/incrementDecrement.txt |  3 ++
 .../expressions/jvmStaticFieldReference.txt   |  3 ++
 .../ir/irText/expressions/kt16904.txt         |  6 +++
 .../ir/irText/expressions/literals.txt        | 17 ++++++++
 .../expressions/memberTypeArguments.txt       |  1 +
 .../expressions/membersImportedFromObject.txt |  6 +++
 .../expressions/multipleThisReferences.txt    |  4 ++
 .../irText/expressions/objectAsCallable.txt   |  4 ++
 .../primitivesImplicitConversions.txt         |  7 ++++
 .../ir/irText/expressions/references.txt      |  4 ++
 .../irText/expressions/reflectionLiterals.txt |  8 ++++
 .../ir/irText/expressions/safeAssignment.txt  |  2 +
 .../safeCallWithIncrementDecrement.txt        |  2 +
 .../ir/irText/expressions/safeCalls.txt       |  2 +
 .../specializedTypeAliasConstructorCall.txt   |  1 +
 .../ir/irText/expressions/stringTemplates.txt | 10 +++++
 .../expressions/thisOfGenericOuterClass.txt   |  4 ++
 .../expressions/typeParameterClassLiteral.txt |  2 +
 .../irText/expressions/useImportedMember.txt  |  6 +++
 .../testData/ir/irText/expressions/values.txt |  3 ++
 .../testData/ir/irText/expressions/vararg.txt |  3 ++
 .../ir/irText/lambdas/anonymousFunction.txt   |  1 +
 .../irText/lambdas/destructuringInLambda.txt  |  4 ++
 .../testData/ir/irText/lambdas/justLambda.txt |  2 +
 .../lambdas/multipleImplicitReceivers.txt     |  1 +
 .../irText/regressions/integerCoercionToT.txt |  3 ++
 .../ir/irText/regressions/kt24114.txt         |  1 +
 .../typeAliasCtorForGenericClass.txt          |  1 +
 .../ir/irText/singletons/enumEntry.txt        |  4 ++
 .../stubs/builtinMap__builtinsmodule.txt      |  6 +++
 .../builtinMap__dependenciesoftestmodule.txt  | 42 +++++++++++++++++++
 .../testData/ir/irText/stubs/javaEnum.txt     |  1 +
 .../ir/irText/stubs/javaEnum__testmodule.txt  |  2 +
 .../ir/irText/stubs/javaInnerClass.txt        |  1 +
 compiler/testData/ir/irText/stubs/simple.txt  |  1 +
 .../irText/stubs/simple__builtinsmodule.txt   |  2 +
 146 files changed, 604 insertions(+), 20 deletions(-)

diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt
index fd64d1b5b15..9e670284e82 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt
@@ -191,7 +191,11 @@ class ClassGenerator(declarationGenerator: DeclarationGenerator) : DeclarationGe
         irClass.addMember(generateDelegatedFunction(irDelegate, delegated, overridden))
     }
 
-    private fun generateDelegatedFunction(irDelegate: IrField, delegated: FunctionDescriptor, overridden: FunctionDescriptor): IrFunction =
+    private fun generateDelegatedFunction(
+        irDelegate: IrField,
+        delegated: FunctionDescriptor,
+        overridden: FunctionDescriptor
+    ): IrSimpleFunction =
         context.symbolTable.declareSimpleFunctionWithOverrides(
             irDelegate.startOffset, irDelegate.endOffset,
             IrDeclarationOrigin.DELEGATED_MEMBER,
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DeclarationGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DeclarationGenerator.kt
index 81998f9526e..f8d29b4a725 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DeclarationGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DeclarationGenerator.kt
@@ -170,7 +170,7 @@ class DeclarationGenerator(override val context: GeneratorContext) : Generator {
             propertyDescriptor.setter?.let { generateFakeOverrideFunction(it, ktElement) }
         )
 
-    private fun generateFakeOverrideFunction(functionDescriptor: FunctionDescriptor, ktElement: KtElement): IrFunction =
+    private fun generateFakeOverrideFunction(functionDescriptor: FunctionDescriptor, ktElement: KtElement): IrSimpleFunction =
         FunctionGenerator(this).generateFakeOverrideFunction(functionDescriptor, ktElement)
 }
 
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 8d98da808ed..22bc30e1588 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
@@ -93,7 +93,7 @@ class DelegatedPropertyGenerator(declarationGenerator: DeclarationGenerator) : D
         ktDelegate: KtPropertyDelegate,
         accessorDescriptor: PropertyAccessorDescriptor,
         generateBody: (IrFunction) -> IrBody
-    ): IrFunction =
+    ): IrSimpleFunction =
         context.symbolTable.declareSimpleFunctionWithOverrides(
             ktDelegate.startOffset, ktDelegate.endOffset,
             IrDeclarationOrigin.DELEGATED_PROPERTY_ACCESSOR,
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt
index c073d07c9ee..b51e13fba28 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt
@@ -47,7 +47,7 @@ class FunctionGenerator(declarationGenerator: DeclarationGenerator) : Declaratio
             ktFunction.bodyExpression?.let { generateFunctionBody(it) }
         }
 
-    fun generateLambdaFunctionDeclaration(ktFunction: KtFunctionLiteral): IrFunction =
+    fun generateLambdaFunctionDeclaration(ktFunction: KtFunctionLiteral): IrSimpleFunction =
         declareSimpleFunction(
             ktFunction,
             null,
@@ -57,7 +57,7 @@ class FunctionGenerator(declarationGenerator: DeclarationGenerator) : Declaratio
             generateLambdaBody(ktFunction)
         }
 
-    fun generateFakeOverrideFunction(functionDescriptor: FunctionDescriptor, ktElement: KtElement): IrFunction =
+    fun generateFakeOverrideFunction(functionDescriptor: FunctionDescriptor, ktElement: KtElement): IrSimpleFunction =
         context.symbolTable.declareSimpleFunctionWithOverrides(
             ktElement.startOffsetOrUndefined, ktElement.endOffsetOrUndefined,
             IrDeclarationOrigin.FAKE_OVERRIDE,
@@ -113,7 +113,7 @@ class FunctionGenerator(declarationGenerator: DeclarationGenerator) : Declaratio
     fun generateDefaultAccessorForPrimaryConstructorParameter(
         descriptor: PropertyAccessorDescriptor,
         ktParameter: KtParameter
-    ): IrFunction =
+    ): IrSimpleFunction =
         context.symbolTable.declareSimpleFunctionWithOverrides(
             ktParameter.startOffsetOrUndefined,
             ktParameter.endOffsetOrUndefined,
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt
index 2c2663341e7..337866ed4fe 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt
@@ -113,19 +113,18 @@ class PropertyGenerator(declarationGenerator: DeclarationGenerator) : Declaratio
                         null
 
             irProperty.getter = generateGetterIfRequired(ktProperty, propertyDescriptor)
-
             irProperty.setter = generateSetterIfRequired(ktProperty, propertyDescriptor)
         }
 
     private fun PropertyDescriptor.hasBackingField(): Boolean =
         get(BindingContext.BACKING_FIELD_REQUIRED, this) ?: false
 
-    private fun generateGetterIfRequired(ktProperty: KtProperty, property: PropertyDescriptor): IrFunction? {
+    private fun generateGetterIfRequired(ktProperty: KtProperty, property: PropertyDescriptor): IrSimpleFunction? {
         val getter = property.getter ?: return null
         return FunctionGenerator(declarationGenerator).generatePropertyAccessor(getter, ktProperty, ktProperty.getter)
     }
 
-    private fun generateSetterIfRequired(ktProperty: KtProperty, property: PropertyDescriptor): IrFunction? {
+    private fun generateSetterIfRequired(ktProperty: KtProperty, property: PropertyDescriptor): IrSimpleFunction? {
         if (!property.isVar) return null
         val setter = property.setter ?: return null
         return FunctionGenerator(declarationGenerator).generatePropertyAccessor(setter, ktProperty, ktProperty.setter)
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrProperty.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrProperty.kt
index 2a4a30547d4..8f09dcb8a34 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrProperty.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrProperty.kt
@@ -38,6 +38,6 @@ interface IrProperty : IrDeclaration {
     val typeParameters: MutableList<IrTypeParameter>
 
     var backingField: IrField?
-    var getter: IrFunction?
-    var setter: IrFunction?
+    var getter: IrSimpleFunction?
+    var setter: IrSimpleFunction?
 }
\ No newline at end of file
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt
index 730f60fdf7b..6c68c3d6f09 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt
@@ -18,12 +18,16 @@ package org.jetbrains.kotlin.ir.declarations
 
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
-import org.jetbrains.kotlin.name.Name
 
 interface IrSimpleFunction : IrFunction, IrSymbolDeclaration<IrSimpleFunctionSymbol> {
     val modality: Modality
     val isTailrec: Boolean
     val isSuspend: Boolean
 
+    var correspondingProperty: IrProperty?
+
     val overriddenSymbols: MutableList<IrSimpleFunctionSymbol>
-}
\ No newline at end of file
+}
+
+val IrFunction.isPropertyAccessor: Boolean
+    get() = this is IrSimpleFunction && correspondingProperty != null
\ No newline at end of file
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt
index 53d7f498084..ea86979c21a 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
+import org.jetbrains.kotlin.ir.declarations.IrProperty
 import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
 import org.jetbrains.kotlin.ir.expressions.IrBody
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
@@ -50,6 +51,8 @@ class IrFunctionImpl(
 
     override val overriddenSymbols: MutableList<IrSimpleFunctionSymbol> = SmartList()
 
+    override var correspondingProperty: IrProperty? = null
+
     constructor(
         startOffset: Int,
         endOffset: Int,
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt
index 68c47260b06..e14643becae 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt
@@ -86,8 +86,8 @@ class IrPropertyImpl(
         isDelegated: Boolean,
         descriptor: PropertyDescriptor,
         backingField: IrField?,
-        getter: IrFunction?,
-        setter: IrFunction?
+        getter: IrSimpleFunction?,
+        setter: IrSimpleFunction?
     ) : this(startOffset, endOffset, origin, isDelegated, descriptor, backingField) {
         this.getter = getter
         this.setter = setter
@@ -95,8 +95,8 @@ class IrPropertyImpl(
 
     override val typeParameters: MutableList<IrTypeParameter> = SmartList()
     override var backingField: IrField? = null
-    override var getter: IrFunction? = null
-    override var setter: IrFunction? = null
+    override var getter: IrSimpleFunction? = null
+    override var setter: IrSimpleFunction? = null
 
     override fun <R, D> accept(visitor: IrElementVisitor<R, D>, data: D): R {
         return visitor.visitProperty(this, data)
@@ -112,7 +112,7 @@ class IrPropertyImpl(
     override fun <D> transformChildren(transformer: IrElementTransformer<D>, data: D) {
         typeParameters.transform { it.transform(transformer, data) }
         backingField = backingField?.transform(transformer, data) as? IrField
-        getter = getter?.transform(transformer, data) as? IrFunction
-        setter = setter?.transform(transformer, data) as? IrFunction
+        getter = getter?.run { transform(transformer, data) as IrSimpleFunction }
+        setter = setter?.run { transform(transformer, data) as IrSimpleFunction }
     }
 }
\ No newline at end of file
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt
index aeea5067874..5ae163f8532 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt
@@ -103,6 +103,7 @@ class DumpIrTreeVisitor(out: Appendable) : IrElementVisitor<Unit, String> {
     override fun visitSimpleFunction(declaration: IrSimpleFunction, data: String) {
         declaration.dumpLabeledElementWith(data) {
             dumpAnnotations(declaration)
+            declaration.correspondingProperty?.render("correspondingProperty")
             declaration.overriddenSymbols.renderDeclarationElementsOrDescriptors("overridden")
             declaration.typeParameters.dumpElements()
             declaration.dispatchReceiverParameter?.accept(this, "\$this")
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt
index d9dd4e2e66c..08296a0ed17 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt
@@ -164,7 +164,7 @@ fun IrClass.addFakeOverrides() {
     val startOffset = this.startOffset
     val endOffset = this.endOffset
 
-    fun FunctionDescriptor.createFunction(): IrFunction = IrFunctionImpl(
+    fun FunctionDescriptor.createFunction(): IrSimpleFunction = IrFunctionImpl(
         startOffset, endOffset,
         IrDeclarationOrigin.FAKE_OVERRIDE, this
     ).apply {
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/PatchDeclarationParents.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/PatchDeclarationParents.kt
index 4c667cf34ee..071f210aa27 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/PatchDeclarationParents.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/PatchDeclarationParents.kt
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.declarations.IrDeclaration
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent
 import org.jetbrains.kotlin.ir.declarations.IrPackageFragment
+import org.jetbrains.kotlin.ir.declarations.IrProperty
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
 import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
 import org.jetbrains.kotlin.ir.visitors.acceptVoid
@@ -52,6 +53,13 @@ class PatchDeclarationParentsVisitor() : IrElementVisitorVoid {
         }
     }
 
+    override fun visitProperty(declaration: IrProperty) {
+        declaration.getter?.let { it.correspondingProperty = declaration }
+        declaration.setter?.let { it.correspondingProperty = declaration }
+
+        super.visitProperty(declaration)
+    }
+
     private fun patchParent(declaration: IrDeclaration) {
         declaration.parent = declarationParentsStack.peekFirst()
     }
diff --git a/compiler/testData/ir/irText/classes/abstractMembers.txt b/compiler/testData/ir/irText/classes/abstractMembers.txt
index 3f7e86bd62b..3c567dc535e 100644
--- a/compiler/testData/ir/irText/classes/abstractMembers.txt
+++ b/compiler/testData/ir/irText/classes/abstractMembers.txt
@@ -11,11 +11,14 @@ FILE fqName:<root> fileName:/abstractMembers.kt
       $this: VALUE_PARAMETER name:<this> type:AbstractClass flags:
     PROPERTY name:abstractVal type:kotlin.Int visibility:public modality:ABSTRACT flags:val
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-abstractVal> visibility:public modality:ABSTRACT <> ($this:AbstractClass) returnType:Int flags:
+        correspondingProperty: PROPERTY name:abstractVal type:kotlin.Int visibility:public modality:ABSTRACT flags:val
         $this: VALUE_PARAMETER name:<this> type:AbstractClass flags:
     PROPERTY name:abstractVar type:kotlin.Int visibility:public modality:ABSTRACT flags:var
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-abstractVar> visibility:public modality:ABSTRACT <> ($this:AbstractClass) returnType:Int flags:
+        correspondingProperty: PROPERTY name:abstractVar type:kotlin.Int visibility:public modality:ABSTRACT flags:var
         $this: VALUE_PARAMETER name:<this> type:AbstractClass flags:
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-abstractVar> visibility:public modality:ABSTRACT <> ($this:AbstractClass, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:abstractVar type:kotlin.Int visibility:public modality:ABSTRACT flags:var
         $this: VALUE_PARAMETER name:<this> type:AbstractClass flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags:
@@ -39,11 +42,14 @@ FILE fqName:<root> fileName:/abstractMembers.kt
       $this: VALUE_PARAMETER name:<this> type:Interface flags:
     PROPERTY name:abstractVal type:kotlin.Int visibility:public modality:ABSTRACT flags:val
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-abstractVal> visibility:public modality:ABSTRACT <> ($this:Interface) returnType:Int flags:
+        correspondingProperty: PROPERTY name:abstractVal type:kotlin.Int visibility:public modality:ABSTRACT flags:val
         $this: VALUE_PARAMETER name:<this> type:Interface flags:
     PROPERTY name:abstractVar type:kotlin.Int visibility:public modality:ABSTRACT flags:var
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-abstractVar> visibility:public modality:ABSTRACT <> ($this:Interface) returnType:Int flags:
+        correspondingProperty: PROPERTY name:abstractVar type:kotlin.Int visibility:public modality:ABSTRACT flags:var
         $this: VALUE_PARAMETER name:<this> type:Interface flags:
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-abstractVar> visibility:public modality:ABSTRACT <> ($this:Interface, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:abstractVar type:kotlin.Int visibility:public modality:ABSTRACT flags:var
         $this: VALUE_PARAMETER name:<this> type:Interface flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags:
diff --git a/compiler/testData/ir/irText/classes/annotationClasses.txt b/compiler/testData/ir/irText/classes/annotationClasses.txt
index 4eb6419c617..8ffccf26af9 100644
--- a/compiler/testData/ir/irText/classes/annotationClasses.txt
+++ b/compiler/testData/ir/irText/classes/annotationClasses.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/annotationClasses.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test1) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -41,6 +42,7 @@ FILE fqName:<root> fileName:/annotationClasses.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int = ...' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test2) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test2 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -70,6 +72,7 @@ FILE fqName:<root> fileName:/annotationClasses.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Test1' type=Test1 origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test3) returnType:Test1 flags:
+        correspondingProperty: PROPERTY name:x type:Test1 visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test3 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Test1'
@@ -99,6 +102,7 @@ FILE fqName:<root> fileName:/annotationClasses.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter vararg xs: Int' type=kotlin.IntArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xs> visibility:public modality:FINAL <> ($this:Test4) returnType:IntArray flags:
+        correspondingProperty: PROPERTY name:xs type:kotlin.IntArray visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test4 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-xs>(): IntArray'
diff --git a/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt b/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt
index 53c7146ea71..09082d7f973 100644
--- a/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt
+++ b/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt
@@ -14,6 +14,7 @@ FILE fqName:<root> fileName:/argumentReorderingInDelegatingConstructorCall.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Base) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Base flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -24,6 +25,7 @@ FILE fqName:<root> fileName:/argumentReorderingInDelegatingConstructorCall.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:Base) returnType:Int flags:
+        correspondingProperty: PROPERTY name:y type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Base flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
@@ -61,11 +63,13 @@ FILE fqName:<root> fileName:/argumentReorderingInDelegatingConstructorCall.kt
         INSTANCE_INITIALIZER_CALL classDescriptor='Test1'
     PROPERTY FAKE_OVERRIDE name:x type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-x> visibility:public modality:FINAL <> ($this:Base) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Base) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:Base flags:
     PROPERTY FAKE_OVERRIDE name:y type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-y> visibility:public modality:FINAL <> ($this:Base) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:y type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:Base) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:Base flags:
@@ -114,11 +118,13 @@ FILE fqName:<root> fileName:/argumentReorderingInDelegatingConstructorCall.kt
             yy: GET_VAR 'tmp0_yy: Int' type=kotlin.Int origin=null
     PROPERTY FAKE_OVERRIDE name:x type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-x> visibility:public modality:FINAL <> ($this:Base) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Base) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:Base flags:
     PROPERTY FAKE_OVERRIDE name:y type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-y> visibility:public modality:FINAL <> ($this:Base) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:y type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:Base) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:Base flags:
diff --git a/compiler/testData/ir/irText/classes/classMembers.txt b/compiler/testData/ir/irText/classes/classMembers.txt
index f8827461d93..67c953aedaf 100644
--- a/compiler/testData/ir/irText/classes/classMembers.txt
+++ b/compiler/testData/ir/irText/classes/classMembers.txt
@@ -17,6 +17,7 @@ FILE fqName:<root> fileName:/classMembers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:y type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
@@ -27,12 +28,14 @@ FILE fqName:<root> fileName:/classMembers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter z: Int = ...' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-z> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:z type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-z>(): Int'
             GET_FIELD 'z: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@C: C' type=C origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-z> visibility:public modality:FINAL <> ($this:C, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:z type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
@@ -50,6 +53,7 @@ FILE fqName:<root> fileName:/classMembers.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=0
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-property> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:property type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-property>(): Int'
@@ -57,18 +61,21 @@ FILE fqName:<root> fileName:/classMembers.kt
               receiver: GET_VAR 'this@C: C' type=C origin=null
     PROPERTY name:propertyWithGet type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN name:<get-propertyWithGet> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:propertyWithGet type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-propertyWithGet>(): Int'
             CONST Int type=kotlin.Int value=42
     PROPERTY name:propertyWithGetAndSet type:kotlin.Int visibility:public modality:FINAL flags:var
       FUN name:<get-propertyWithGetAndSet> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:propertyWithGetAndSet type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-propertyWithGetAndSet>(): Int'
             CALL '<get-z>(): Int' type=kotlin.Int origin=GET_PROPERTY
               $this: GET_VAR 'this@C: C' type=C origin=null
       FUN name:<set-propertyWithGetAndSet> visibility:public modality:FINAL <> ($this:C, value:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:propertyWithGetAndSet type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         VALUE_PARAMETER name:value index:0 type:kotlin.Int flags:
         BLOCK_BODY
@@ -177,3 +184,4 @@ FILE fqName:<root> fileName:/classMembers.kt
       overridden:
         FUN IR_EXTERNAL_DECLARATION_STUB name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags:
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any flags:
+
diff --git a/compiler/testData/ir/irText/classes/classes.txt b/compiler/testData/ir/irText/classes/classes.txt
index 9f1d28cc36b..60cb68b1b8b 100644
--- a/compiler/testData/ir/irText/classes/classes.txt
+++ b/compiler/testData/ir/irText/classes/classes.txt
@@ -113,11 +113,13 @@ FILE fqName:<root> fileName:/classes.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnumClass> flags:
     PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnumClass>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnumClass> flags:
     PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnumClass>) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnumClass> flags:
diff --git a/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.txt b/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.txt
index eade04e2f87..3ca532548b7 100644
--- a/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.txt
+++ b/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.txt
@@ -21,6 +21,7 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter stringArray: Array<String>' type=kotlin.Array<kotlin.String> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-stringArray> visibility:public modality:FINAL <> ($this:Test1) returnType:Array<String> flags:
+        correspondingProperty: PROPERTY name:stringArray type:kotlin.Array<kotlin.String> visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-stringArray>(): Array<String>'
@@ -31,6 +32,7 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter charArray: CharArray' type=kotlin.CharArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-charArray> visibility:public modality:FINAL <> ($this:Test1) returnType:CharArray flags:
+        correspondingProperty: PROPERTY name:charArray type:kotlin.CharArray visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-charArray>(): CharArray'
@@ -41,6 +43,7 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter booleanArray: BooleanArray' type=kotlin.BooleanArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-booleanArray> visibility:public modality:FINAL <> ($this:Test1) returnType:BooleanArray flags:
+        correspondingProperty: PROPERTY name:booleanArray type:kotlin.BooleanArray visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-booleanArray>(): BooleanArray'
@@ -51,6 +54,7 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter byteArray: ByteArray' type=kotlin.ByteArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-byteArray> visibility:public modality:FINAL <> ($this:Test1) returnType:ByteArray flags:
+        correspondingProperty: PROPERTY name:byteArray type:kotlin.ByteArray visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-byteArray>(): ByteArray'
@@ -61,6 +65,7 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter shortArray: ShortArray' type=kotlin.ShortArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-shortArray> visibility:public modality:FINAL <> ($this:Test1) returnType:ShortArray flags:
+        correspondingProperty: PROPERTY name:shortArray type:kotlin.ShortArray visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-shortArray>(): ShortArray'
@@ -71,6 +76,7 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter intArray: IntArray' type=kotlin.IntArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-intArray> visibility:public modality:FINAL <> ($this:Test1) returnType:IntArray flags:
+        correspondingProperty: PROPERTY name:intArray type:kotlin.IntArray visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-intArray>(): IntArray'
@@ -81,6 +87,7 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter longArray: LongArray' type=kotlin.LongArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-longArray> visibility:public modality:FINAL <> ($this:Test1) returnType:LongArray flags:
+        correspondingProperty: PROPERTY name:longArray type:kotlin.LongArray visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-longArray>(): LongArray'
@@ -91,6 +98,7 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter floatArray: FloatArray' type=kotlin.FloatArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-floatArray> visibility:public modality:FINAL <> ($this:Test1) returnType:FloatArray flags:
+        correspondingProperty: PROPERTY name:floatArray type:kotlin.FloatArray visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-floatArray>(): FloatArray'
@@ -101,6 +109,7 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter doubleArray: DoubleArray' type=kotlin.DoubleArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-doubleArray> visibility:public modality:FINAL <> ($this:Test1) returnType:DoubleArray flags:
+        correspondingProperty: PROPERTY name:doubleArray type:kotlin.DoubleArray visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-doubleArray>(): DoubleArray'
@@ -473,6 +482,7 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter genericArray: Array<T>' type=kotlin.Array<T> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-genericArray> visibility:public modality:FINAL <> ($this:Test2<T>) returnType:Array<T> flags:
+        correspondingProperty: PROPERTY name:genericArray type:kotlin.Array<T> visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test2<T> flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-genericArray>(): Array<T>'
@@ -571,6 +581,7 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter anyArrayN: Array<Any>?' type=kotlin.Array<kotlin.Any>? origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-anyArrayN> visibility:public modality:FINAL <> ($this:Test3) returnType:Array<Any>? flags:
+        correspondingProperty: PROPERTY name:anyArrayN type:kotlin.Array<kotlin.Any>? visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test3 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-anyArrayN>(): Array<Any>?'
diff --git a/compiler/testData/ir/irText/classes/dataClasses.txt b/compiler/testData/ir/irText/classes/dataClasses.txt
index d0df132a2f1..4893173444a 100644
--- a/compiler/testData/ir/irText/classes/dataClasses.txt
+++ b/compiler/testData/ir/irText/classes/dataClasses.txt
@@ -15,6 +15,7 @@ FILE fqName:<root> fileName:/dataClasses.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test1) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -25,6 +26,7 @@ FILE fqName:<root> fileName:/dataClasses.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:Test1) returnType:String flags:
+        correspondingProperty: PROPERTY name:y type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): String'
@@ -35,6 +37,7 @@ FILE fqName:<root> fileName:/dataClasses.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter z: Any' type=kotlin.Any origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-z> visibility:public modality:FINAL <> ($this:Test1) returnType:Any flags:
+        correspondingProperty: PROPERTY name:z type:kotlin.Any visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-z>(): Any'
@@ -197,6 +200,7 @@ FILE fqName:<root> fileName:/dataClasses.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Any?' type=kotlin.Any? origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test2) returnType:Any? flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Any? visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test2 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Any?'
@@ -307,6 +311,7 @@ FILE fqName:<root> fileName:/dataClasses.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter d: Double' type=kotlin.Double origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-d> visibility:public modality:FINAL <> ($this:Test3) returnType:Double flags:
+        correspondingProperty: PROPERTY name:d type:kotlin.Double visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test3 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-d>(): Double'
@@ -317,6 +322,7 @@ FILE fqName:<root> fileName:/dataClasses.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter dn: Double?' type=kotlin.Double? origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-dn> visibility:public modality:FINAL <> ($this:Test3) returnType:Double? flags:
+        correspondingProperty: PROPERTY name:dn type:kotlin.Double? visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test3 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-dn>(): Double?'
@@ -327,6 +333,7 @@ FILE fqName:<root> fileName:/dataClasses.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter f: Float' type=kotlin.Float origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-f> visibility:public modality:FINAL <> ($this:Test3) returnType:Float flags:
+        correspondingProperty: PROPERTY name:f type:kotlin.Float visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test3 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-f>(): Float'
@@ -337,6 +344,7 @@ FILE fqName:<root> fileName:/dataClasses.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter df: Float?' type=kotlin.Float? origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-df> visibility:public modality:FINAL <> ($this:Test3) returnType:Float? flags:
+        correspondingProperty: PROPERTY name:df type:kotlin.Float? visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test3 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-df>(): Float?'
diff --git a/compiler/testData/ir/irText/classes/dataClassesGeneric.txt b/compiler/testData/ir/irText/classes/dataClassesGeneric.txt
index 7be8e0d4ba7..746181a39e7 100644
--- a/compiler/testData/ir/irText/classes/dataClassesGeneric.txt
+++ b/compiler/testData/ir/irText/classes/dataClassesGeneric.txt
@@ -16,6 +16,7 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: T' type=T origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test1<T>) returnType:T flags:
+        correspondingProperty: PROPERTY name:x type:T visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1<T> flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): T'
diff --git a/compiler/testData/ir/irText/classes/delegatedImplementation.txt b/compiler/testData/ir/irText/classes/delegatedImplementation.txt
index 1c3886086a2..115848dae8b 100644
--- a/compiler/testData/ir/irText/classes/delegatedImplementation.txt
+++ b/compiler/testData/ir/irText/classes/delegatedImplementation.txt
@@ -72,22 +72,28 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
       CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
     PROPERTY name:x type:kotlin.String visibility:public modality:ABSTRACT flags:val
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:ABSTRACT <> ($this:IOther) returnType:String flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.String visibility:public modality:ABSTRACT flags:val
         $this: VALUE_PARAMETER name:<this> type:IOther flags:
     PROPERTY name:y type:kotlin.Int visibility:public modality:ABSTRACT flags:var
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:ABSTRACT <> ($this:IOther) returnType:Int flags:
+        correspondingProperty: PROPERTY name:y type:kotlin.Int visibility:public modality:ABSTRACT flags:var
         $this: VALUE_PARAMETER name:<this> type:IOther flags:
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-y> visibility:public modality:ABSTRACT <> ($this:IOther, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:y type:kotlin.Int visibility:public modality:ABSTRACT flags:var
         $this: VALUE_PARAMETER name:<this> type:IOther flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
     PROPERTY name:z1 type:kotlin.Int visibility:public modality:ABSTRACT flags:val
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-z1> visibility:public modality:ABSTRACT <> ($this:IOther, $receiver:kotlin.Byte) returnType:Int flags:
+        correspondingProperty: PROPERTY name:z1 type:kotlin.Int visibility:public modality:ABSTRACT flags:val
         $this: VALUE_PARAMETER name:<this> type:IOther flags:
         $receiver: VALUE_PARAMETER name:<this> type:kotlin.Byte flags:
     PROPERTY name:z2 type:kotlin.Int visibility:public modality:ABSTRACT flags:var
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-z2> visibility:public modality:ABSTRACT <> ($this:IOther, $receiver:kotlin.Byte) returnType:Int flags:
+        correspondingProperty: PROPERTY name:z2 type:kotlin.Int visibility:public modality:ABSTRACT flags:var
         $this: VALUE_PARAMETER name:<this> type:IOther flags:
         $receiver: VALUE_PARAMETER name:<this> type:kotlin.Byte flags:
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-z2> visibility:public modality:ABSTRACT <> ($this:IOther, $receiver:kotlin.Byte, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:z2 type:kotlin.Int visibility:public modality:ABSTRACT flags:var
         $this: VALUE_PARAMETER name:<this> type:IOther flags:
         $receiver: VALUE_PARAMETER name:<this> type:kotlin.Byte flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
@@ -123,6 +129,7 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
                 EXPRESSION_BODY
                   GET_VAR 'value-parameter x0: String' type=kotlin.String origin=null
               FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:OPEN <> ($this:otherImpl.<no name provided>) returnType:String flags:
+                correspondingProperty: PROPERTY name:x type:kotlin.String visibility:public modality:OPEN flags:val
                 overridden:
                   FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:ABSTRACT <> ($this:IOther) returnType:String flags:
                 $this: VALUE_PARAMETER name:<this> type:otherImpl.<no name provided> flags:
@@ -135,6 +142,7 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
                 EXPRESSION_BODY
                   GET_VAR 'value-parameter y0: Int' type=kotlin.Int origin=null
               FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:OPEN <> ($this:otherImpl.<no name provided>) returnType:Int flags:
+                correspondingProperty: PROPERTY name:y type:kotlin.Int visibility:public modality:OPEN flags:var
                 overridden:
                   FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:ABSTRACT <> ($this:IOther) returnType:Int flags:
                 $this: VALUE_PARAMETER name:<this> type:otherImpl.<no name provided> flags:
@@ -143,6 +151,7 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
                     GET_FIELD 'y: Int' type=kotlin.Int origin=null
                       receiver: GET_VAR 'this@<no name provided>: <no name provided>' type=otherImpl.<no name provided> origin=null
               FUN DEFAULT_PROPERTY_ACCESSOR name:<set-y> visibility:public modality:OPEN <> ($this:otherImpl.<no name provided>, <set-?>:kotlin.Int) returnType:Unit flags:
+                correspondingProperty: PROPERTY name:y type:kotlin.Int visibility:public modality:OPEN flags:var
                 overridden:
                   FUN DEFAULT_PROPERTY_ACCESSOR name:<set-y> visibility:public modality:ABSTRACT <> ($this:IOther, <set-?>:kotlin.Int) returnType:Unit flags:
                 $this: VALUE_PARAMETER name:<this> type:otherImpl.<no name provided> flags:
@@ -153,6 +162,7 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
                     value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
             PROPERTY name:z1 type:kotlin.Int visibility:public modality:OPEN flags:val
               FUN name:<get-z1> visibility:public modality:OPEN <> ($this:otherImpl.<no name provided>, $receiver:kotlin.Byte) returnType:Int flags:
+                correspondingProperty: PROPERTY name:z1 type:kotlin.Int visibility:public modality:OPEN flags:val
                 overridden:
                   FUN DEFAULT_PROPERTY_ACCESSOR name:<get-z1> visibility:public modality:ABSTRACT <> ($this:IOther, $receiver:kotlin.Byte) returnType:Int flags:
                 $this: VALUE_PARAMETER name:<this> type:otherImpl.<no name provided> flags:
@@ -162,6 +172,7 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
                     CONST Int type=kotlin.Int value=1
             PROPERTY name:z2 type:kotlin.Int visibility:public modality:OPEN flags:var
               FUN name:<get-z2> visibility:public modality:OPEN <> ($this:otherImpl.<no name provided>, $receiver:kotlin.Byte) returnType:Int flags:
+                correspondingProperty: PROPERTY name:z2 type:kotlin.Int visibility:public modality:OPEN flags:var
                 overridden:
                   FUN DEFAULT_PROPERTY_ACCESSOR name:<get-z2> visibility:public modality:ABSTRACT <> ($this:IOther, $receiver:kotlin.Byte) returnType:Int flags:
                 $this: VALUE_PARAMETER name:<this> type:otherImpl.<no name provided> flags:
@@ -170,6 +181,7 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
                   RETURN type=kotlin.Nothing from='<get-z2>() on Byte: Int'
                     CONST Int type=kotlin.Int value=2
               FUN name:<set-z2> visibility:public modality:OPEN <> ($this:otherImpl.<no name provided>, $receiver:kotlin.Byte, value:kotlin.Int) returnType:Unit flags:
+                correspondingProperty: PROPERTY name:z2 type:kotlin.Int visibility:public modality:OPEN flags:var
                 overridden:
                   FUN DEFAULT_PROPERTY_ACCESSOR name:<set-z2> visibility:public modality:ABSTRACT <> ($this:IOther, $receiver:kotlin.Byte, <set-?>:kotlin.Int) returnType:Unit flags:
                 $this: VALUE_PARAMETER name:<this> type:otherImpl.<no name provided> flags:
@@ -295,6 +307,7 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
           y0: CONST Int type=kotlin.Int value=42
     PROPERTY DELEGATED_MEMBER name:z1 type:kotlin.Int visibility:public modality:OPEN flags:val
       FUN DELEGATED_MEMBER name:<get-z1> visibility:public modality:OPEN <> ($this:Test2, $receiver:kotlin.Byte) returnType:Int flags:
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:z1 type:kotlin.Int visibility:public modality:OPEN flags:val
         overridden:
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-z1> visibility:public modality:ABSTRACT <> ($this:IOther, $receiver:kotlin.Byte) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:Test2 flags:
@@ -307,6 +320,7 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
               $receiver: GET_VAR 'this@z1: Byte' type=kotlin.Byte origin=null
     PROPERTY DELEGATED_MEMBER name:x type:kotlin.String visibility:public modality:OPEN flags:val
       FUN DELEGATED_MEMBER name:<get-x> visibility:public modality:OPEN <> ($this:Test2) returnType:String flags:
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:x type:kotlin.String visibility:public modality:OPEN flags:val
         overridden:
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:ABSTRACT <> ($this:IOther) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:Test2 flags:
@@ -317,6 +331,7 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
                 receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
     PROPERTY DELEGATED_MEMBER name:z2 type:kotlin.Int visibility:public modality:OPEN flags:var
       FUN DELEGATED_MEMBER name:<get-z2> visibility:public modality:OPEN <> ($this:Test2, $receiver:kotlin.Byte) returnType:Int flags:
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:z2 type:kotlin.Int visibility:public modality:OPEN flags:var
         overridden:
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-z2> visibility:public modality:ABSTRACT <> ($this:IOther, $receiver:kotlin.Byte) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:Test2 flags:
@@ -328,6 +343,7 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
                 receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
               $receiver: GET_VAR 'this@z2: Byte' type=kotlin.Byte origin=null
       FUN DELEGATED_MEMBER name:<set-z2> visibility:public modality:OPEN <> ($this:Test2, $receiver:kotlin.Byte, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:z2 type:kotlin.Int visibility:public modality:OPEN flags:var
         overridden:
           FUN DEFAULT_PROPERTY_ACCESSOR name:<set-z2> visibility:public modality:ABSTRACT <> ($this:IOther, $receiver:kotlin.Byte, <set-?>:kotlin.Int) returnType:Unit flags:
         $this: VALUE_PARAMETER name:<this> type:Test2 flags:
@@ -341,6 +357,7 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
             <set-?>: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     PROPERTY DELEGATED_MEMBER name:y type:kotlin.Int visibility:public modality:OPEN flags:var
       FUN DELEGATED_MEMBER name:<get-y> visibility:public modality:OPEN <> ($this:Test2) returnType:Int flags:
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:y type:kotlin.Int visibility:public modality:OPEN flags:var
         overridden:
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:ABSTRACT <> ($this:IOther) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:Test2 flags:
@@ -350,6 +367,7 @@ FILE fqName:<root> fileName:/delegatedImplementation.kt
               $this: GET_FIELD '`Test2$IOther$delegate`: IOther' type=IOther origin=null
                 receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
       FUN DELEGATED_MEMBER name:<set-y> visibility:public modality:OPEN <> ($this:Test2, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:y type:kotlin.Int visibility:public modality:OPEN flags:var
         overridden:
           FUN DEFAULT_PROPERTY_ACCESSOR name:<set-y> visibility:public modality:ABSTRACT <> ($this:IOther, <set-?>:kotlin.Int) returnType:Unit flags:
         $this: VALUE_PARAMETER name:<this> type:Test2 flags:
diff --git a/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.txt b/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.txt
index 8643e77a503..7f271bfa875 100644
--- a/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.txt
+++ b/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.txt
@@ -16,6 +16,7 @@ FILE fqName:<root> fileName:/delegatingConstructorCallToTypeAliasConstructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: T' type=T origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:Cell<T>) returnType:T flags:
+        correspondingProperty: PROPERTY name:value type:T visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Cell<T> flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): T'
@@ -48,6 +49,7 @@ FILE fqName:<root> fileName:/delegatingConstructorCallToTypeAliasConstructor.kt
         INSTANCE_INITIALIZER_CALL classDescriptor='C1'
     PROPERTY FAKE_OVERRIDE name:value type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-value> visibility:public modality:FINAL <> ($this:Cell<kotlin.String>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:value type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:Cell<T>) returnType:T flags:
         $this: VALUE_PARAMETER name:<this> type:Cell<kotlin.String> flags:
@@ -76,6 +78,7 @@ FILE fqName:<root> fileName:/delegatingConstructorCallToTypeAliasConstructor.kt
         INSTANCE_INITIALIZER_CALL classDescriptor='C2'
     PROPERTY FAKE_OVERRIDE name:value type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-value> visibility:public modality:FINAL <> ($this:Cell<kotlin.String>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:value type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:Cell<T>) returnType:T flags:
         $this: VALUE_PARAMETER name:<this> type:Cell<kotlin.String> flags:
diff --git a/compiler/testData/ir/irText/classes/enum.txt b/compiler/testData/ir/irText/classes/enum.txt
index 5777fa686a5..88dc6690928 100644
--- a/compiler/testData/ir/irText/classes/enum.txt
+++ b/compiler/testData/ir/irText/classes/enum.txt
@@ -40,11 +40,13 @@ FILE fqName:<root> fileName:/enum.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum1> flags:
     PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum1>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum1> flags:
     PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum1>) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum1> flags:
@@ -72,6 +74,7 @@ FILE fqName:<root> fileName:/enum.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestEnum2) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestEnum2 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -114,11 +117,13 @@ FILE fqName:<root> fileName:/enum.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum2> flags:
     PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum2>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum2> flags:
     PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum2>) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum2> flags:
@@ -185,11 +190,13 @@ FILE fqName:<root> fileName:/enum.kt
           $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum3> flags:
         PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum3>) returnType:String flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum3>) returnType:String flags:
             $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum3> flags:
         PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum3>) returnType:Int flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum3>) returnType:Int flags:
             $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum3> flags:
@@ -227,11 +234,13 @@ FILE fqName:<root> fileName:/enum.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum3> flags:
     PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum3>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum3> flags:
     PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum3>) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum3> flags:
@@ -259,6 +268,7 @@ FILE fqName:<root> fileName:/enum.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestEnum4) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestEnum4 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -310,16 +320,19 @@ FILE fqName:<root> fileName:/enum.kt
           $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum4> flags:
         PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum4>) returnType:String flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum4>) returnType:String flags:
             $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum4> flags:
         PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum4>) returnType:Int flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum4>) returnType:Int flags:
             $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum4> flags:
         PROPERTY FAKE_OVERRIDE name:x type:kotlin.Int visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-x> visibility:public modality:FINAL <> ($this:TestEnum4) returnType:Int flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:x type:kotlin.Int visibility:public modality:FINAL flags:val
             overridden:
               FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestEnum4) returnType:Int flags:
             $this: VALUE_PARAMETER name:<this> type:TestEnum4 flags:
@@ -341,6 +354,7 @@ FILE fqName:<root> fileName:/enum.kt
         PROPERTY name:z type:kotlin.Int visibility:public modality:FINAL flags:val
           FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:public flags:final
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-z> visibility:public modality:FINAL <> ($this:TestEnum4.TEST2) returnType:Int flags:
+            correspondingProperty: PROPERTY name:z type:kotlin.Int visibility:public modality:FINAL flags:val
             $this: VALUE_PARAMETER name:<this> type:TestEnum4.TEST2 flags:
             BLOCK_BODY
               RETURN type=kotlin.Nothing from='<get-z>(): Int'
@@ -387,16 +401,19 @@ FILE fqName:<root> fileName:/enum.kt
           $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum4> flags:
         PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum4>) returnType:String flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum4>) returnType:String flags:
             $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum4> flags:
         PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum4>) returnType:Int flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum4>) returnType:Int flags:
             $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum4> flags:
         PROPERTY FAKE_OVERRIDE name:x type:kotlin.Int visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-x> visibility:public modality:FINAL <> ($this:TestEnum4) returnType:Int flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:x type:kotlin.Int visibility:public modality:FINAL flags:val
             overridden:
               FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestEnum4) returnType:Int flags:
             $this: VALUE_PARAMETER name:<this> type:TestEnum4 flags:
@@ -434,11 +451,13 @@ FILE fqName:<root> fileName:/enum.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum4> flags:
     PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum4>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum4> flags:
     PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum4>) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum4> flags:
@@ -468,6 +487,7 @@ FILE fqName:<root> fileName:/enum.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int = ...' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestEnum5) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestEnum5 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -508,11 +528,13 @@ FILE fqName:<root> fileName:/enum.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum5> flags:
     PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum5>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum5> flags:
     PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum5>) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum5> flags:
diff --git a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt
index d5ae552bd42..4c42f1682ac 100644
--- a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt
+++ b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt
@@ -14,6 +14,7 @@ FILE fqName:<root> fileName:/enumWithSecondaryCtor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test0) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test0 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -53,11 +54,13 @@ FILE fqName:<root> fileName:/enumWithSecondaryCtor.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Test0> flags:
     PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<Test0>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Test0> flags:
     PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<Test0>) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Test0> flags:
@@ -85,6 +88,7 @@ FILE fqName:<root> fileName:/enumWithSecondaryCtor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test1) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -127,11 +131,13 @@ FILE fqName:<root> fileName:/enumWithSecondaryCtor.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Test1> flags:
     PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<Test1>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Test1> flags:
     PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<Test1>) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Test1> flags:
@@ -159,6 +165,7 @@ FILE fqName:<root> fileName:/enumWithSecondaryCtor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test2) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test2 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -209,16 +216,19 @@ FILE fqName:<root> fileName:/enumWithSecondaryCtor.kt
           $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Test2> flags:
         PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<Test2>) returnType:String flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<Test2>) returnType:String flags:
             $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Test2> flags:
         PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<Test2>) returnType:Int flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<Test2>) returnType:Int flags:
             $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Test2> flags:
         PROPERTY FAKE_OVERRIDE name:x type:kotlin.Int visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-x> visibility:public modality:FINAL <> ($this:Test2) returnType:Int flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:x type:kotlin.Int visibility:public modality:FINAL flags:val
             overridden:
               FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test2) returnType:Int flags:
             $this: VALUE_PARAMETER name:<this> type:Test2 flags:
@@ -272,16 +282,19 @@ FILE fqName:<root> fileName:/enumWithSecondaryCtor.kt
           $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Test2> flags:
         PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<Test2>) returnType:String flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<Test2>) returnType:String flags:
             $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Test2> flags:
         PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<Test2>) returnType:Int flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<Test2>) returnType:Int flags:
             $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Test2> flags:
         PROPERTY FAKE_OVERRIDE name:x type:kotlin.Int visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-x> visibility:public modality:FINAL <> ($this:Test2) returnType:Int flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:x type:kotlin.Int visibility:public modality:FINAL flags:val
             overridden:
               FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test2) returnType:Int flags:
             $this: VALUE_PARAMETER name:<this> type:Test2 flags:
@@ -323,11 +336,13 @@ FILE fqName:<root> fileName:/enumWithSecondaryCtor.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Test2> flags:
     PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<Test2>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Test2> flags:
     PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<Test2>) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Test2> flags:
diff --git a/compiler/testData/ir/irText/classes/initBlock.txt b/compiler/testData/ir/irText/classes/initBlock.txt
index c271e8bafbc..df6b9dff70e 100644
--- a/compiler/testData/ir/irText/classes/initBlock.txt
+++ b/compiler/testData/ir/irText/classes/initBlock.txt
@@ -37,6 +37,7 @@ FILE fqName:<root> fileName:/initBlock.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test2) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test2 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
diff --git a/compiler/testData/ir/irText/classes/initVal.txt b/compiler/testData/ir/irText/classes/initVal.txt
index ed0f1c88502..15428af606d 100644
--- a/compiler/testData/ir/irText/classes/initVal.txt
+++ b/compiler/testData/ir/irText/classes/initVal.txt
@@ -13,6 +13,7 @@ FILE fqName:<root> fileName:/initVal.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestInitValFromParameter) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestInitValFromParameter flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -44,6 +45,7 @@ FILE fqName:<root> fileName:/initVal.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=0
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestInitValInClass) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestInitValInClass flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -73,6 +75,7 @@ FILE fqName:<root> fileName:/initVal.kt
     PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
       FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:final
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestInitValInInitBlock) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestInitValInInitBlock flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
diff --git a/compiler/testData/ir/irText/classes/initVar.txt b/compiler/testData/ir/irText/classes/initVar.txt
index f57bd4348ff..e4d6a7071b1 100644
--- a/compiler/testData/ir/irText/classes/initVar.txt
+++ b/compiler/testData/ir/irText/classes/initVar.txt
@@ -13,12 +13,14 @@ FILE fqName:<root> fileName:/initVar.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestInitVarFromParameter) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:TestInitVarFromParameter flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@TestInitVarFromParameter: TestInitVarFromParameter' type=TestInitVarFromParameter origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-x> visibility:public modality:FINAL <> ($this:TestInitVarFromParameter, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:TestInitVarFromParameter flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
@@ -51,12 +53,14 @@ FILE fqName:<root> fileName:/initVar.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=0
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestInitVarInClass) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:TestInitVarInClass flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@TestInitVarInClass: TestInitVarInClass' type=TestInitVarInClass origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-x> visibility:public modality:FINAL <> ($this:TestInitVarInClass, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:TestInitVarInClass flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
@@ -87,12 +91,14 @@ FILE fqName:<root> fileName:/initVar.kt
     PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var
       FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestInitVarInInitBlock) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:TestInitVarInInitBlock flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@TestInitVarInInitBlock: TestInitVarInInitBlock' type=TestInitVarInInitBlock origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-x> visibility:public modality:FINAL <> ($this:TestInitVarInInitBlock, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:TestInitVarInInitBlock flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
@@ -130,12 +136,14 @@ FILE fqName:<root> fileName:/initVar.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=0
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestInitVarWithCustomSetter) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:TestInitVarWithCustomSetter flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@TestInitVarWithCustomSetter: TestInitVarWithCustomSetter' type=TestInitVarWithCustomSetter origin=null
       FUN name:<set-x> visibility:public modality:FINAL <> ($this:TestInitVarWithCustomSetter, value:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:TestInitVarWithCustomSetter flags:
         VALUE_PARAMETER name:value index:0 type:kotlin.Int flags:
         BLOCK_BODY
@@ -162,12 +170,14 @@ FILE fqName:<root> fileName:/initVar.kt
     PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var
       FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestInitVarWithCustomSetterWithExplicitCtor) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:TestInitVarWithCustomSetterWithExplicitCtor flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@TestInitVarWithCustomSetterWithExplicitCtor: TestInitVarWithCustomSetterWithExplicitCtor' type=TestInitVarWithCustomSetterWithExplicitCtor origin=null
       FUN name:<set-x> visibility:public modality:FINAL <> ($this:TestInitVarWithCustomSetterWithExplicitCtor, value:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:TestInitVarWithCustomSetterWithExplicitCtor flags:
         VALUE_PARAMETER name:value index:0 type:kotlin.Int flags:
         BLOCK_BODY
@@ -203,12 +213,14 @@ FILE fqName:<root> fileName:/initVar.kt
     PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var
       FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestInitVarWithCustomSetterInCtor) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:TestInitVarWithCustomSetterInCtor flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@TestInitVarWithCustomSetterInCtor: TestInitVarWithCustomSetterInCtor' type=TestInitVarWithCustomSetterInCtor origin=null
       FUN name:<set-x> visibility:public modality:FINAL <> ($this:TestInitVarWithCustomSetterInCtor, value:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:TestInitVarWithCustomSetterInCtor flags:
         VALUE_PARAMETER name:value index:0 type:kotlin.Int flags:
         BLOCK_BODY
diff --git a/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt b/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt
index 0e3e00884df..d9955d73b12 100644
--- a/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt
+++ b/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt
@@ -22,6 +22,7 @@ FILE fqName:<root> fileName:/innerClassWithDelegatingConstructor.kt
           EXPRESSION_BODY
             GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
         FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Outer.Inner) returnType:Int flags:
+          correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
           $this: VALUE_PARAMETER name:<this> type:Outer.Inner flags:
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-x>(): Int'
diff --git a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.txt b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.txt
index 6eabeb75200..1ad93e73f4b 100644
--- a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.txt
+++ b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.txt
@@ -22,6 +22,7 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter runA: A.(String) -> Unit = ...' type=A.(kotlin.String) -> kotlin.Unit origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-runA> visibility:public modality:FINAL <> ($this:A) returnType:[@kotlin.ExtensionFunctionType] Function2<A, String, Unit> flags:
+        correspondingProperty: PROPERTY name:runA type:A.(kotlin.String) -> kotlin.Unit visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-runA>(): A.(String) -> Unit'
@@ -142,6 +143,7 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Any = ...' type=kotlin.Any origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:B) returnType:Any flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Any visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:B flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Any'
diff --git a/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt b/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt
index 8b29dd07276..1293809adea 100644
--- a/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt
+++ b/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt
@@ -45,6 +45,7 @@ FILE fqName:<root> fileName:/objectLiteralExpressions.kt
               $this: VALUE_PARAMETER name:<this> type:kotlin.Any flags:
           CALL 'constructor <no name provided>()' type=test1.<no name provided> origin=OBJECT_LITERAL
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:Any flags:
+      correspondingProperty: PROPERTY name:test1 type:kotlin.Any visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): Any'
           GET_FIELD 'test1: Any' type=kotlin.Any origin=null
@@ -82,6 +83,7 @@ FILE fqName:<root> fileName:/objectLiteralExpressions.kt
               $this: VALUE_PARAMETER name:<this> type:kotlin.Any flags:
           CALL 'constructor <no name provided>()' type=test2.<no name provided> origin=OBJECT_LITERAL
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:IFoo flags:
+      correspondingProperty: PROPERTY name:test2 type:IFoo visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): IFoo'
           GET_FIELD 'test2: IFoo' type=IFoo origin=null
diff --git a/compiler/testData/ir/irText/classes/objectWithInitializers.txt b/compiler/testData/ir/irText/classes/objectWithInitializers.txt
index 03a8b5d638b..503a55b92cc 100644
--- a/compiler/testData/ir/irText/classes/objectWithInitializers.txt
+++ b/compiler/testData/ir/irText/classes/objectWithInitializers.txt
@@ -33,6 +33,7 @@ FILE fqName:<root> fileName:/objectWithInitializers.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=1
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -41,6 +42,7 @@ FILE fqName:<root> fileName:/objectWithInitializers.kt
     PROPERTY name:y type:kotlin.Int visibility:public modality:FINAL flags:val
       FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public flags:final
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:Test) returnType:Int flags:
+        correspondingProperty: PROPERTY name:y type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
diff --git a/compiler/testData/ir/irText/classes/primaryConstructor.txt b/compiler/testData/ir/irText/classes/primaryConstructor.txt
index 1e4d9acb315..8e0789f8c0c 100644
--- a/compiler/testData/ir/irText/classes/primaryConstructor.txt
+++ b/compiler/testData/ir/irText/classes/primaryConstructor.txt
@@ -14,6 +14,7 @@ FILE fqName:<root> fileName:/primaryConstructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test1) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -24,6 +25,7 @@ FILE fqName:<root> fileName:/primaryConstructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:Test1) returnType:Int flags:
+        correspondingProperty: PROPERTY name:y type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
@@ -57,6 +59,7 @@ FILE fqName:<root> fileName:/primaryConstructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:Test2) returnType:Int flags:
+        correspondingProperty: PROPERTY name:y type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test2 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
@@ -67,6 +70,7 @@ FILE fqName:<root> fileName:/primaryConstructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test2) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test2 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -100,6 +104,7 @@ FILE fqName:<root> fileName:/primaryConstructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:Test3) returnType:Int flags:
+        correspondingProperty: PROPERTY name:y type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test3 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
@@ -108,6 +113,7 @@ FILE fqName:<root> fileName:/primaryConstructor.kt
     PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
       FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:final
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test3) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test3 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
diff --git a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt
index 5d4e3b22e74..f591cbf7074 100644
--- a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt
+++ b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt
@@ -77,6 +77,7 @@ FILE fqName:<root> fileName:/primaryConstructorWithSuperConstructorCall.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestWithDelegatingConstructor) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestWithDelegatingConstructor flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -87,6 +88,7 @@ FILE fqName:<root> fileName:/primaryConstructorWithSuperConstructorCall.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:TestWithDelegatingConstructor) returnType:Int flags:
+        correspondingProperty: PROPERTY name:y type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestWithDelegatingConstructor flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
diff --git a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.txt b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.txt
index e2f7b1a73dd..aaaf0b5707e 100644
--- a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.txt
+++ b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.txt
@@ -8,6 +8,7 @@ FILE fqName:<root> fileName:/qualifiedSuperCalls.kt
       BLOCK_BODY
     PROPERTY name:bar type:kotlin.Int visibility:public modality:OPEN flags:val
       FUN name:<get-bar> visibility:public modality:OPEN <> ($this:ILeft) returnType:Int flags:
+        correspondingProperty: PROPERTY name:bar type:kotlin.Int visibility:public modality:OPEN flags:val
         $this: VALUE_PARAMETER name:<this> type:ILeft flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-bar>(): Int'
@@ -34,6 +35,7 @@ FILE fqName:<root> fileName:/qualifiedSuperCalls.kt
       BLOCK_BODY
     PROPERTY name:bar type:kotlin.Int visibility:public modality:OPEN flags:val
       FUN name:<get-bar> visibility:public modality:OPEN <> ($this:IRight) returnType:Int flags:
+        correspondingProperty: PROPERTY name:bar type:kotlin.Int visibility:public modality:OPEN flags:val
         $this: VALUE_PARAMETER name:<this> type:IRight flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-bar>(): Int'
@@ -72,6 +74,7 @@ FILE fqName:<root> fileName:/qualifiedSuperCalls.kt
           $this: GET_VAR 'this@CBoth: CBoth' type=CBoth origin=null
     PROPERTY name:bar type:kotlin.Int visibility:public modality:OPEN flags:val
       FUN name:<get-bar> visibility:public modality:OPEN <> ($this:CBoth) returnType:Int flags:
+        correspondingProperty: PROPERTY name:bar type:kotlin.Int visibility:public modality:OPEN flags:val
         overridden:
           FUN name:<get-bar> visibility:public modality:OPEN <> ($this:ILeft) returnType:Int flags:
           FUN name:<get-bar> visibility:public modality:OPEN <> ($this:IRight) returnType:Int flags:
diff --git a/compiler/testData/ir/irText/classes/sealedClasses.txt b/compiler/testData/ir/irText/classes/sealedClasses.txt
index 14a02e6c311..827d39fad5f 100644
--- a/compiler/testData/ir/irText/classes/sealedClasses.txt
+++ b/compiler/testData/ir/irText/classes/sealedClasses.txt
@@ -21,6 +21,7 @@ FILE fqName:<root> fileName:/sealedClasses.kt
           EXPRESSION_BODY
             GET_VAR 'value-parameter number: Double' type=kotlin.Double origin=INITIALIZE_PROPERTY_FROM_PARAMETER
         FUN DEFAULT_PROPERTY_ACCESSOR name:<get-number> visibility:public modality:FINAL <> ($this:Expr.Const) returnType:Double flags:
+          correspondingProperty: PROPERTY name:number type:kotlin.Double visibility:public modality:FINAL flags:val
           $this: VALUE_PARAMETER name:<this> type:Expr.Const flags:
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-number>(): Double'
@@ -54,6 +55,7 @@ FILE fqName:<root> fileName:/sealedClasses.kt
           EXPRESSION_BODY
             GET_VAR 'value-parameter e1: Expr' type=Expr origin=INITIALIZE_PROPERTY_FROM_PARAMETER
         FUN DEFAULT_PROPERTY_ACCESSOR name:<get-e1> visibility:public modality:FINAL <> ($this:Expr.Sum) returnType:Expr flags:
+          correspondingProperty: PROPERTY name:e1 type:Expr visibility:public modality:FINAL flags:val
           $this: VALUE_PARAMETER name:<this> type:Expr.Sum flags:
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-e1>(): Expr'
@@ -64,6 +66,7 @@ FILE fqName:<root> fileName:/sealedClasses.kt
           EXPRESSION_BODY
             GET_VAR 'value-parameter e2: Expr' type=Expr origin=INITIALIZE_PROPERTY_FROM_PARAMETER
         FUN DEFAULT_PROPERTY_ACCESSOR name:<get-e2> visibility:public modality:FINAL <> ($this:Expr.Sum) returnType:Expr flags:
+          correspondingProperty: PROPERTY name:e2 type:Expr visibility:public modality:FINAL flags:val
           $this: VALUE_PARAMETER name:<this> type:Expr.Sum flags:
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-e2>(): Expr'
diff --git a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt
index 61841ea824f..5c4fe98dc18 100644
--- a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt
+++ b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt
@@ -29,6 +29,7 @@ FILE fqName:<root> fileName:/secondaryConstructorWithInitializersFromClassBody.k
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=0
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestProperty) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestProperty flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -58,6 +59,7 @@ FILE fqName:<root> fileName:/secondaryConstructorWithInitializersFromClassBody.k
     PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
       FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:final
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestInitBlock) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestInitBlock flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
diff --git a/compiler/testData/ir/irText/classes/superCalls.txt b/compiler/testData/ir/irText/classes/superCalls.txt
index 0c7ca4d2a06..6e6dbd00826 100644
--- a/compiler/testData/ir/irText/classes/superCalls.txt
+++ b/compiler/testData/ir/irText/classes/superCalls.txt
@@ -15,6 +15,7 @@ FILE fqName:<root> fileName:/superCalls.kt
         EXPRESSION_BODY
           CONST String type=kotlin.String value=
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:OPEN <> ($this:Base) returnType:String flags:
+        correspondingProperty: PROPERTY name:bar type:kotlin.String visibility:public modality:OPEN flags:val
         $this: VALUE_PARAMETER name:<this> type:Base flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-bar>(): String'
@@ -50,6 +51,7 @@ FILE fqName:<root> fileName:/superCalls.kt
           $this: GET_VAR 'this@Derived: Derived' type=Derived origin=null
     PROPERTY name:bar type:kotlin.String visibility:public modality:OPEN flags:val
       FUN name:<get-bar> visibility:public modality:OPEN <> ($this:Derived) returnType:String flags:
+        correspondingProperty: PROPERTY name:bar type:kotlin.String visibility:public modality:OPEN flags:val
         overridden:
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:OPEN <> ($this:Base) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:Derived flags:
diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.txt
index bb5b37a8598..9a2d88cfe2f 100644
--- a/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/annotationsInAnnotationArguments.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:A1) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -39,6 +40,7 @@ FILE fqName:<root> fileName:/annotationsInAnnotationArguments.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter a: A1' type=A1 origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-a> visibility:public modality:FINAL <> ($this:A2) returnType:A1 flags:
+        correspondingProperty: PROPERTY name:a type:A1 visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A2 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-a>(): A1'
@@ -68,6 +70,7 @@ FILE fqName:<root> fileName:/annotationsInAnnotationArguments.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter xs: Array<A1>' type=kotlin.Array<A1> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xs> visibility:public modality:FINAL <> ($this:AA) returnType:Array<A1> flags:
+        correspondingProperty: PROPERTY name:xs type:kotlin.Array<A1> visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:AA flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-xs>(): Array<A1>'
diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.txt
index 1dca624f936..5c19891c27a 100644
--- a/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.txt
@@ -15,6 +15,7 @@ FILE fqName:<root> fileName:/annotationsWithDefaultParameterValues.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: String = ...' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:A) returnType:String flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): String'
@@ -25,6 +26,7 @@ FILE fqName:<root> fileName:/annotationsWithDefaultParameterValues.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: Int = ...' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:A) returnType:Int flags:
+        correspondingProperty: PROPERTY name:y type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.txt
index 92327a91296..cf31177122c 100644
--- a/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/annotationsWithVarargParameters.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter vararg xs: String' type=kotlin.Array<out kotlin.String> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xs> visibility:public modality:FINAL <> ($this:A) returnType:Array<out String> flags:
+        correspondingProperty: PROPERTY name:xs type:kotlin.Array<out kotlin.String> visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-xs>(): Array<out String>'
diff --git a/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.txt b/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.txt
index 5a80ccd80b6..d9f864b01a0 100644
--- a/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/arrayInAnnotationArguments.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: IntArray' type=kotlin.IntArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestAnnWithIntArray) returnType:IntArray flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.IntArray visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestAnnWithIntArray flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): IntArray'
@@ -39,6 +40,7 @@ FILE fqName:<root> fileName:/arrayInAnnotationArguments.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Array<String>' type=kotlin.Array<kotlin.String> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestAnnWithStringArray) returnType:Array<String> flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Array<kotlin.String> visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestAnnWithStringArray flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Array<String>'
diff --git a/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.txt b/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.txt
index f99fc8d029b..a3f4d96739d 100644
--- a/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/classLiteralInAnnotation.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter klass: KClass<*>' type=kotlin.reflect.KClass<*> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-klass> visibility:public modality:FINAL <> ($this:A) returnType:KClass<*> flags:
+        correspondingProperty: PROPERTY name:klass type:kotlin.reflect.KClass<*> visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-klass>(): KClass<*>'
@@ -88,6 +89,7 @@ FILE fqName:<root> fileName:/classLiteralInAnnotation.kt
           CALL 'constructor <no name provided>()' type=test2.<no name provided><T> origin=OBJECT_LITERAL
   PROPERTY name:test3 type:kotlin.Any visibility:public modality:FINAL flags:var
     FUN name:<get-test3> visibility:public modality:FINAL <T> ($receiver:T) returnType:Any flags:inline
+      correspondingProperty: PROPERTY name:test3 type:kotlin.Any visibility:public modality:FINAL flags:var
       TYPE_PARAMETER name:T index:0 variance: upperBounds:[kotlin.Any?]
         superClassifiers:
           CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
@@ -121,6 +123,7 @@ FILE fqName:<root> fileName:/classLiteralInAnnotation.kt
                 $this: VALUE_PARAMETER name:<this> type:kotlin.Any flags:
             CALL 'constructor <no name provided>()' type=<get-test3>.<no name provided> origin=OBJECT_LITERAL
     FUN name:<set-test3> visibility:public modality:FINAL <T> ($receiver:T, v:kotlin.Any) returnType:Unit flags:inline
+      correspondingProperty: PROPERTY name:test3 type:kotlin.Any visibility:public modality:FINAL flags:var
       TYPE_PARAMETER name:T index:0 variance: upperBounds:[kotlin.Any?]
         superClassifiers:
           CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
@@ -155,3 +158,4 @@ FILE fqName:<root> fileName:/classLiteralInAnnotation.kt
                   FUN IR_EXTERNAL_DECLARATION_STUB name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags:
                 $this: VALUE_PARAMETER name:<this> type:kotlin.Any flags:
             CALL 'constructor <no name provided>()' type=<set-test3>.<no name provided> origin=OBJECT_LITERAL
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.txt
index c91e7422dc8..26bbe0bd6c4 100644
--- a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/classesWithAnnotations.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestAnn) returnType:String flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestAnn flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): String'
@@ -181,11 +182,13 @@ FILE fqName:<root> fileName:/classesWithAnnotations.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum> flags:
     PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum> flags:
     PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum>) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum> flags:
diff --git a/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.txt b/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.txt
index 3778fa3325d..34d2705fd70 100644
--- a/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.txt
@@ -4,6 +4,7 @@ FILE fqName:<root> fileName:/constExpressionsInAnnotationArguments.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=1
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-ONE> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:ONE type:kotlin.Int visibility:public modality:FINAL flags:const,val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-ONE>(): Int'
           GET_FIELD 'ONE: Int' type=kotlin.Int origin=null
@@ -18,6 +19,7 @@ FILE fqName:<root> fileName:/constExpressionsInAnnotationArguments.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:A) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
diff --git a/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.txt
index d8b110cdb31..0e3b458b880 100644
--- a/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/constructorsWithAnnotations.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestAnn) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestAnn flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
diff --git a/compiler/testData/ir/irText/declarations/annotations/delegateFieldWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/delegateFieldWithAnnotations.txt
index f267ceb75c0..04afbc4ebdf 100644
--- a/compiler/testData/ir/irText/declarations/annotations/delegateFieldWithAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/delegateFieldWithAnnotations.txt
@@ -31,6 +31,7 @@ FILE fqName:<root> fileName:/delegateFieldWithAnnotations.kt
                   CONST Int type=kotlin.Int value=42
             FUNCTION_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int origin=LAMBDA
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:delegated,val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): Int'
           CALL 'getValue(Any?, KProperty<*>) on Lazy<Int>: Int' type=kotlin.Int origin=null
diff --git a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.txt
index ab9b7083af0..5187106eec0 100644
--- a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/delegatedPropertyAccessorsWithAnnotations.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:A) returnType:String flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): String'
@@ -42,12 +43,14 @@ FILE fqName:<root> fileName:/delegatedPropertyAccessorsWithAnnotations.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:Cell) returnType:Int flags:
+        correspondingProperty: PROPERTY name:value type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:Cell flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): Int'
             GET_FIELD 'value: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@Cell: Cell' type=Cell origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-value> visibility:public modality:FINAL <> ($this:Cell, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:value type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:Cell flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
@@ -93,6 +96,7 @@ FILE fqName:<root> fileName:/delegatedPropertyAccessorsWithAnnotations.kt
       annotations:
         CALL 'constructor A(String)' type=A origin=null
           x: CONST String type=kotlin.String value=test1.get
+      correspondingProperty: PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:delegated,val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): Int'
           CALL 'getValue(Any?, Any?): Int' type=kotlin.Int origin=null
@@ -108,6 +112,7 @@ FILE fqName:<root> fileName:/delegatedPropertyAccessorsWithAnnotations.kt
       annotations:
         CALL 'constructor A(String)' type=A origin=null
           x: CONST String type=kotlin.String value=test2.get
+      correspondingProperty: PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:delegated,var
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): Int'
           CALL 'getValue(Any?, Any?): Int' type=kotlin.Int origin=null
@@ -118,6 +123,7 @@ FILE fqName:<root> fileName:/delegatedPropertyAccessorsWithAnnotations.kt
       annotations:
         CALL 'constructor A(String)' type=A origin=null
           x: CONST String type=kotlin.String value=test2.set
+      correspondingProperty: PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:delegated,var
       VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         annotations:
           CALL 'constructor A(String)' type=A origin=null
diff --git a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.txt
index 7e0d01bf51f..33d68b5532f 100644
--- a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/enumEntriesWithAnnotations.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestAnn) returnType:String flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestAnn flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): String'
@@ -63,6 +64,7 @@ FILE fqName:<root> fileName:/enumEntriesWithAnnotations.kt
             EXPRESSION_BODY
               CONST Int type=kotlin.Int value=42
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestEnum.ENTRY2) returnType:Int flags:
+            correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
             $this: VALUE_PARAMETER name:<this> type:TestEnum.ENTRY2 flags:
             BLOCK_BODY
               RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -96,11 +98,13 @@ FILE fqName:<root> fileName:/enumEntriesWithAnnotations.kt
           $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum> flags:
         PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum>) returnType:String flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum>) returnType:String flags:
             $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum> flags:
         PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum>) returnType:Int flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum>) returnType:Int flags:
             $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum> flags:
@@ -136,11 +140,13 @@ FILE fqName:<root> fileName:/enumEntriesWithAnnotations.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum> flags:
     PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum> flags:
     PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<TestEnum>) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<TestEnum> flags:
diff --git a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.txt b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.txt
index fee789f9d86..acdbf83c00e 100644
--- a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.txt
@@ -44,11 +44,13 @@ FILE fqName:<root> fileName:/enumsInAnnotationArguments.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<En> flags:
     PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<En>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<En> flags:
     PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<En>) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<En> flags:
@@ -72,6 +74,7 @@ FILE fqName:<root> fileName:/enumsInAnnotationArguments.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: En' type=En origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestAnn) returnType:En flags:
+        correspondingProperty: PROPERTY name:x type:En visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestAnn flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): En'
diff --git a/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.txt
index 6566479ece4..b4cda4190e6 100644
--- a/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/fieldsWithAnnotations.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestAnn) returnType:String flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestAnn flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): String'
@@ -36,6 +37,7 @@ FILE fqName:<root> fileName:/fieldsWithAnnotations.kt
       EXPRESSION_BODY
         CONST String type=kotlin.String value=a val
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testVal> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:testVal type:kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testVal>(): String'
           GET_FIELD 'testVal: String' type=kotlin.String origin=null
@@ -47,11 +49,14 @@ FILE fqName:<root> fileName:/fieldsWithAnnotations.kt
       EXPRESSION_BODY
         CONST String type=kotlin.String value=a var
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testVar> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:testVar type:kotlin.String visibility:public modality:FINAL flags:var
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testVar>(): String'
           GET_FIELD 'testVar: String' type=kotlin.String origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<set-testVar> visibility:public modality:FINAL <> (<set-?>:kotlin.String) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:testVar type:kotlin.String visibility:public modality:FINAL flags:var
       VALUE_PARAMETER name:<set-?> index:0 type:kotlin.String flags:
       BLOCK_BODY
         SET_FIELD 'testVar: String' type=kotlin.Unit origin=null
           value: GET_VAR 'value-parameter <set-?>: String' type=kotlin.String origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.txt
index 6d9fb4229d9..28efcc6ac75 100644
--- a/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.txt
@@ -19,6 +19,7 @@ FILE fqName:test fileName:/fileAnnotations.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:test.A) returnType:String flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:test.A flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): String'
diff --git a/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.txt
index bd6514ea3e0..172be110fee 100644
--- a/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/functionsWithAnnotations.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestAnn) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestAnn flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
diff --git a/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.txt
index 03c9e2f3a81..a636f9685ec 100644
--- a/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/localDelegatedPropertiesWithAnnotations.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:A) returnType:String flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): String'
diff --git a/compiler/testData/ir/irText/declarations/annotations/primaryConstructorParameterWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/primaryConstructorParameterWithAnnotations.txt
index 133a38f6449..9569370076c 100644
--- a/compiler/testData/ir/irText/declarations/annotations/primaryConstructorParameterWithAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/primaryConstructorParameterWithAnnotations.txt
@@ -33,6 +33,7 @@ FILE fqName:<root> fileName:/primaryConstructorParameterWithAnnotations.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
diff --git a/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.txt
index 5ca31299d3f..7a00fe23735 100644
--- a/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/propertiesWithAnnotations.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestAnn) returnType:String flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestAnn flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): String'
@@ -36,6 +37,7 @@ FILE fqName:<root> fileName:/propertiesWithAnnotations.kt
       EXPRESSION_BODY
         CONST String type=kotlin.String value=
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testVal> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:testVal type:kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testVal>(): String'
           GET_FIELD 'testVal: String' type=kotlin.String origin=null
diff --git a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.txt
index 02d64e03702..2c24c21c3bb 100644
--- a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/propertyAccessorsFromClassHeaderWithAnnotations.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:A) returnType:String flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): String'
@@ -46,6 +47,7 @@ FILE fqName:<root> fileName:/propertyAccessorsFromClassHeaderWithAnnotations.kt
         annotations:
           CALL 'constructor A(String)' type=A origin=null
             x: CONST String type=kotlin.String value=C.x.get
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -59,6 +61,7 @@ FILE fqName:<root> fileName:/propertyAccessorsFromClassHeaderWithAnnotations.kt
         annotations:
           CALL 'constructor A(String)' type=A origin=null
             x: CONST String type=kotlin.String value=C.y.get
+        correspondingProperty: PROPERTY name:y type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
@@ -68,6 +71,7 @@ FILE fqName:<root> fileName:/propertyAccessorsFromClassHeaderWithAnnotations.kt
         annotations:
           CALL 'constructor A(String)' type=A origin=null
             x: CONST String type=kotlin.String value=C.y.set
+        correspondingProperty: PROPERTY name:y type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
@@ -87,3 +91,4 @@ FILE fqName:<root> fileName:/propertyAccessorsFromClassHeaderWithAnnotations.kt
       overridden:
         FUN IR_EXTERNAL_DECLARATION_STUB name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags:
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any flags:
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.txt
index e513845c1b1..7ce5d7ba20e 100644
--- a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/propertyAccessorsWithAnnotations.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestAnn) returnType:String flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestAnn flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): String'
@@ -33,6 +34,7 @@ FILE fqName:<root> fileName:/propertyAccessorsWithAnnotations.kt
       annotations:
         CALL 'constructor TestAnn(String)' type=TestAnn origin=null
           x: CONST String type=kotlin.String value=test1.get
+      correspondingProperty: PROPERTY name:test1 type:kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): String'
           CONST String type=kotlin.String value=
@@ -41,6 +43,7 @@ FILE fqName:<root> fileName:/propertyAccessorsWithAnnotations.kt
       annotations:
         CALL 'constructor TestAnn(String)' type=TestAnn origin=null
           x: CONST String type=kotlin.String value=test2.get
+      correspondingProperty: PROPERTY name:test2 type:kotlin.String visibility:public modality:FINAL flags:var
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): String'
           CONST String type=kotlin.String value=
@@ -48,6 +51,7 @@ FILE fqName:<root> fileName:/propertyAccessorsWithAnnotations.kt
       annotations:
         CALL 'constructor TestAnn(String)' type=TestAnn origin=null
           x: CONST String type=kotlin.String value=test2.set
+      correspondingProperty: PROPERTY name:test2 type:kotlin.String visibility:public modality:FINAL flags:var
       VALUE_PARAMETER name:value index:0 type:kotlin.String flags:
       BLOCK_BODY
   PROPERTY name:test3 type:kotlin.String visibility:public modality:FINAL flags:val
@@ -58,6 +62,7 @@ FILE fqName:<root> fileName:/propertyAccessorsWithAnnotations.kt
       annotations:
         CALL 'constructor TestAnn(String)' type=TestAnn origin=null
           x: CONST String type=kotlin.String value=test3.get
+      correspondingProperty: PROPERTY name:test3 type:kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test3>(): String'
           GET_FIELD 'test3: String' type=kotlin.String origin=null
@@ -69,6 +74,7 @@ FILE fqName:<root> fileName:/propertyAccessorsWithAnnotations.kt
       annotations:
         CALL 'constructor TestAnn(String)' type=TestAnn origin=null
           x: CONST String type=kotlin.String value=test4.get
+      correspondingProperty: PROPERTY name:test4 type:kotlin.String visibility:public modality:FINAL flags:var
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test4>(): String'
           GET_FIELD 'test4: String' type=kotlin.String origin=null
@@ -76,7 +82,9 @@ FILE fqName:<root> fileName:/propertyAccessorsWithAnnotations.kt
       annotations:
         CALL 'constructor TestAnn(String)' type=TestAnn origin=null
           x: CONST String type=kotlin.String value=test4.set
+      correspondingProperty: PROPERTY name:test4 type:kotlin.String visibility:public modality:FINAL flags:var
       VALUE_PARAMETER name:<set-?> index:0 type:kotlin.String flags:
       BLOCK_BODY
         SET_FIELD 'test4: String' type=kotlin.Unit origin=null
           value: GET_VAR 'value-parameter <set-?>: String' type=kotlin.String origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.txt
index 576a851d637..2ffd5f54653 100644
--- a/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.txt
@@ -22,10 +22,12 @@ FILE fqName:<root> fileName:/propertySetterParameterWithAnnotations.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=0
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-p> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:p type:kotlin.Int visibility:public modality:FINAL flags:var
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-p>(): Int'
           GET_FIELD 'p: Int' type=kotlin.Int origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<set-p> visibility:public modality:FINAL <> (<set-?>:kotlin.Int) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:p type:kotlin.Int visibility:public modality:FINAL flags:var
       VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         annotations:
           CALL 'constructor AnnParam()' type=AnnParam origin=null
@@ -46,12 +48,14 @@ FILE fqName:<root> fileName:/propertySetterParameterWithAnnotations.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter p: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-p> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:p type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-p>(): Int'
             GET_FIELD 'p: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@C: C' type=C origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-p> visibility:public modality:FINAL <> ($this:C, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:p type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
           annotations:
@@ -73,3 +77,4 @@ FILE fqName:<root> fileName:/propertySetterParameterWithAnnotations.kt
       overridden:
         FUN IR_EXTERNAL_DECLARATION_STUB name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags:
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any flags:
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/receiverParameterWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/receiverParameterWithAnnotations.txt
index 2b24295f941..a4e06a87c34 100644
--- a/compiler/testData/ir/irText/declarations/annotations/receiverParameterWithAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/receiverParameterWithAnnotations.txt
@@ -35,6 +35,7 @@ FILE fqName:<root> fileName:/receiverParameterWithAnnotations.kt
           CONST String type=kotlin.String value=
     PROPERTY name:p type:kotlin.String visibility:public modality:FINAL flags:val
       FUN name:<get-p> visibility:public modality:FINAL <> ($this:A, $receiver:@receiver:Ann kotlin.String?) returnType:String flags:
+        correspondingProperty: PROPERTY name:p type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A flags:
         $receiver: VALUE_PARAMETER name:<this> type:@receiver:Ann kotlin.String? flags:
           annotations:
@@ -64,6 +65,7 @@ FILE fqName:<root> fileName:/receiverParameterWithAnnotations.kt
         CONST String type=kotlin.String value=
   PROPERTY name:topLevelP type:kotlin.String visibility:public modality:FINAL flags:val
     FUN name:<get-topLevelP> visibility:public modality:FINAL <> ($receiver:@receiver:Ann kotlin.String) returnType:String flags:
+      correspondingProperty: PROPERTY name:topLevelP type:kotlin.String visibility:public modality:FINAL flags:val
       $receiver: VALUE_PARAMETER name:<this> type:@receiver:Ann kotlin.String flags:
         annotations:
           CALL 'constructor Ann()' type=Ann origin=null
diff --git a/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.txt b/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.txt
index 6d033c8cfb7..40c56584c88 100644
--- a/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/spreadOperatorInAnnotationArguments.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter vararg xs: String' type=kotlin.Array<out kotlin.String> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xs> visibility:public modality:FINAL <> ($this:A) returnType:Array<out String> flags:
+        correspondingProperty: PROPERTY name:xs type:kotlin.Array<out kotlin.String> visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-xs>(): Array<out String>'
diff --git a/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.txt
index 0333a54ed65..b1f17cf0642 100644
--- a/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.txt
@@ -14,6 +14,7 @@ FILE fqName:<root> fileName:/typeAliasesWithAnnotations.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestAnn) returnType:String flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestAnn flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): String'
diff --git a/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.txt
index b99bb6d7284..72f8f4ee65d 100644
--- a/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/valueParametersWithAnnotations.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestAnn) returnType:String flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestAnn flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): String'
@@ -51,6 +52,7 @@ FILE fqName:<root> fileName:/valueParametersWithAnnotations.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xx> visibility:public modality:FINAL <> ($this:TestClassConstructor1) returnType:Int flags:
+        correspondingProperty: PROPERTY name:xx type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestClassConstructor1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-xx>(): Int'
diff --git a/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.txt b/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.txt
index 1f6c281e8bd..c420dc2e77a 100644
--- a/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/varargsInAnnotationArguments.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter vararg xs: Int' type=kotlin.IntArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xs> visibility:public modality:FINAL <> ($this:A1) returnType:IntArray flags:
+        correspondingProperty: PROPERTY name:xs type:kotlin.IntArray visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-xs>(): IntArray'
@@ -39,6 +40,7 @@ FILE fqName:<root> fileName:/varargsInAnnotationArguments.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter vararg xs: String' type=kotlin.Array<out kotlin.String> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xs> visibility:public modality:FINAL <> ($this:A2) returnType:Array<out String> flags:
+        correspondingProperty: PROPERTY name:xs type:kotlin.Array<out kotlin.String> visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A2 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-xs>(): Array<out String>'
@@ -68,6 +70,7 @@ FILE fqName:<root> fileName:/varargsInAnnotationArguments.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter vararg xs: A1' type=kotlin.Array<out A1> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xs> visibility:public modality:FINAL <> ($this:AA) returnType:Array<out A1> flags:
+        correspondingProperty: PROPERTY name:xs type:kotlin.Array<out A1> visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:AA flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-xs>(): Array<out A1>'
diff --git a/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.txt
index 9cf6cbfae30..aa4e140d320 100644
--- a/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/variablesWithAnnotations.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestAnn) returnType:String flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestAnn flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): String'
diff --git a/compiler/testData/ir/irText/declarations/catchParameterInTopLevelProperty.txt b/compiler/testData/ir/irText/declarations/catchParameterInTopLevelProperty.txt
index c2697e6d50e..69f22d0fddd 100644
--- a/compiler/testData/ir/irText/declarations/catchParameterInTopLevelProperty.txt
+++ b/compiler/testData/ir/irText/declarations/catchParameterInTopLevelProperty.txt
@@ -8,6 +8,7 @@ FILE fqName:<root> fileName:/catchParameterInTopLevelProperty.kt
             VAR CATCH_PARAMETER name:e type:kotlin.Throwable flags:val
             BLOCK type=kotlin.Unit origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:Unit flags:
+      correspondingProperty: PROPERTY name:test type:kotlin.Unit visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test>(): Unit'
           GET_FIELD 'test: Unit' type=kotlin.Unit origin=null
diff --git a/compiler/testData/ir/irText/declarations/classLevelProperties.txt b/compiler/testData/ir/irText/declarations/classLevelProperties.txt
index eadf248ac14..1b02bf54eb0 100644
--- a/compiler/testData/ir/irText/declarations/classLevelProperties.txt
+++ b/compiler/testData/ir/irText/declarations/classLevelProperties.txt
@@ -12,6 +12,7 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=0
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test1>(): Int'
@@ -19,6 +20,7 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
               receiver: GET_VAR 'this@C: C' type=C origin=null
     PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN name:<get-test2> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test2>(): Int'
@@ -28,12 +30,14 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=0
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:test3 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test3>(): Int'
             GET_FIELD 'test3: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@C: C' type=C origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-test3> visibility:public modality:FINAL <> ($this:C, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:test3 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
@@ -45,12 +49,14 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=1
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test4> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:test4 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test4>(): Int'
             GET_FIELD 'test4: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@C: C' type=C origin=null
       FUN name:<set-test4> visibility:public modality:FINAL <> ($this:C, value:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:test4 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         VALUE_PARAMETER name:value index:0 type:kotlin.Int flags:
         BLOCK_BODY
@@ -62,12 +68,14 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=1
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test5> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:test5 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test5>(): Int'
             GET_FIELD 'test5: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@C: C' type=C origin=null
       FUN name:<set-test5> visibility:private modality:FINAL <> ($this:C, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:test5 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
@@ -79,6 +87,7 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=1
       FUN name:<get-test6> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:test6 type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test6>(): Int'
@@ -96,6 +105,7 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
                     CONST Int type=kotlin.Int value=42
               FUNCTION_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int origin=LAMBDA
       FUN DELEGATED_PROPERTY_ACCESSOR name:<get-test7> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:test7 type:kotlin.Int visibility:public modality:FINAL flags:delegated,val
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test7>(): Int'
@@ -112,6 +122,7 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
             <K>: String
             <V>: Int
       FUN DELEGATED_PROPERTY_ACCESSOR name:<get-test8> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:test8 type:kotlin.Int visibility:public modality:FINAL flags:delegated,var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test8>(): Int'
@@ -123,6 +134,7 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
               thisRef: GET_VAR 'this@C: C' type=C origin=null
               property: PROPERTY_REFERENCE 'test8: Int' field=null getter='<get-test8>(): Int' setter='<set-test8>(Int): Unit' type=kotlin.reflect.KMutableProperty1<C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
       FUN DELEGATED_PROPERTY_ACCESSOR name:<set-test8> visibility:public modality:FINAL <> ($this:C, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:test8 type:kotlin.Int visibility:public modality:FINAL flags:delegated,var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
diff --git a/compiler/testData/ir/irText/declarations/delegatedProperties.txt b/compiler/testData/ir/irText/declarations/delegatedProperties.txt
index b25eed0185f..f8c8fa5478e 100644
--- a/compiler/testData/ir/irText/declarations/delegatedProperties.txt
+++ b/compiler/testData/ir/irText/declarations/delegatedProperties.txt
@@ -11,6 +11,7 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
                   CONST Int type=kotlin.Int value=42
             FUNCTION_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int origin=LAMBDA
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:delegated,val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): Int'
           CALL 'getValue(Any?, KProperty<*>) on Lazy<Int>: Int' type=kotlin.Int origin=null
@@ -32,6 +33,7 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter map: MutableMap<String, Any>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-map> visibility:public modality:FINAL <> ($this:C) returnType:MutableMap<String, Any> flags:
+        correspondingProperty: PROPERTY name:map type:kotlin.collections.MutableMap<kotlin.String, kotlin.Any> visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-map>(): MutableMap<String, Any>'
@@ -49,6 +51,7 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
                     CONST Int type=kotlin.Int value=42
               FUNCTION_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int origin=LAMBDA
       FUN DELEGATED_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:delegated,val
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test2>(): Int'
@@ -64,6 +67,7 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
           CALL '<get-map>(): MutableMap<String, Any>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> origin=GET_PROPERTY
             $this: GET_VAR 'this@C: C' type=C origin=null
       FUN DELEGATED_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> ($this:C) returnType:Any flags:
+        correspondingProperty: PROPERTY name:test3 type:kotlin.Any visibility:public modality:FINAL flags:delegated,var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test3>(): Any'
@@ -75,6 +79,7 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
               thisRef: GET_VAR 'this@C: C' type=C origin=null
               property: PROPERTY_REFERENCE 'test3: Any' field=null getter='<get-test3>(): Any' setter='<set-test3>(Any): Unit' type=kotlin.reflect.KMutableProperty1<C, kotlin.Any> origin=PROPERTY_REFERENCE_FOR_DELEGATE
       FUN DELEGATED_PROPERTY_ACCESSOR name:<set-test3> visibility:public modality:FINAL <> ($this:C, <set-?>:kotlin.Any) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:test3 type:kotlin.Any visibility:public modality:FINAL flags:delegated,var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Any flags:
         BLOCK_BODY
@@ -106,6 +111,7 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
           <K>: String
           <V>: Any
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-test4> visibility:public modality:FINAL <> () returnType:Any flags:
+      correspondingProperty: PROPERTY name:test4 type:kotlin.Any visibility:public modality:FINAL flags:delegated,var
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test4>(): Any'
           CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, out Any>: Any' type=kotlin.Any origin=null
@@ -115,6 +121,7 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
             thisRef: CONST Null type=kotlin.Nothing? value=null
             property: PROPERTY_REFERENCE 'test4: Any' field=null getter='<get-test4>(): Any' setter='<set-test4>(Any): Unit' type=kotlin.reflect.KMutableProperty0<kotlin.Any> origin=PROPERTY_REFERENCE_FOR_DELEGATE
     FUN DELEGATED_PROPERTY_ACCESSOR name:<set-test4> visibility:public modality:FINAL <> (<set-?>:kotlin.Any) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:test4 type:kotlin.Any visibility:public modality:FINAL flags:delegated,var
       VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Any flags:
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<set-test4>(Any): Unit'
diff --git a/compiler/testData/ir/irText/declarations/extensionProperties.txt b/compiler/testData/ir/irText/declarations/extensionProperties.txt
index 81a9dedb65d..b23bb0386e8 100644
--- a/compiler/testData/ir/irText/declarations/extensionProperties.txt
+++ b/compiler/testData/ir/irText/declarations/extensionProperties.txt
@@ -1,17 +1,20 @@
 FILE fqName:<root> fileName:/extensionProperties.kt
   PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:val
     FUN name:<get-test1> visibility:public modality:FINAL <> ($receiver:kotlin.String) returnType:Int flags:
+      correspondingProperty: PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:val
       $receiver: VALUE_PARAMETER name:<this> type:kotlin.String flags:
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>() on String: Int'
           CONST Int type=kotlin.Int value=42
   PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:var
     FUN name:<get-test2> visibility:public modality:FINAL <> ($receiver:kotlin.String) returnType:Int flags:
+      correspondingProperty: PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:var
       $receiver: VALUE_PARAMETER name:<this> type:kotlin.String flags:
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>() on String: Int'
           CONST Int type=kotlin.Int value=42
     FUN name:<set-test2> visibility:public modality:FINAL <> ($receiver:kotlin.String, value:kotlin.Int) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:var
       $receiver: VALUE_PARAMETER name:<this> type:kotlin.String flags:
       VALUE_PARAMETER name:value index:0 type:kotlin.Int flags:
       BLOCK_BODY
@@ -25,6 +28,7 @@ FILE fqName:<root> fileName:/extensionProperties.kt
         INSTANCE_INITIALIZER_CALL classDescriptor='Host'
     PROPERTY name:test3 type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN name:<get-test3> visibility:public modality:FINAL <> ($this:Host, $receiver:kotlin.String) returnType:Int flags:
+        correspondingProperty: PROPERTY name:test3 type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Host flags:
         $receiver: VALUE_PARAMETER name:<this> type:kotlin.String flags:
         BLOCK_BODY
@@ -32,12 +36,14 @@ FILE fqName:<root> fileName:/extensionProperties.kt
             CONST Int type=kotlin.Int value=42
     PROPERTY name:test4 type:kotlin.Int visibility:public modality:FINAL flags:var
       FUN name:<get-test4> visibility:public modality:FINAL <> ($this:Host, $receiver:kotlin.String) returnType:Int flags:
+        correspondingProperty: PROPERTY name:test4 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:Host flags:
         $receiver: VALUE_PARAMETER name:<this> type:kotlin.String flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test4>() on String: Int'
             CONST Int type=kotlin.Int value=42
       FUN name:<set-test4> visibility:public modality:FINAL <> ($this:Host, $receiver:kotlin.String, value:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:test4 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:Host flags:
         $receiver: VALUE_PARAMETER name:<this> type:kotlin.String flags:
         VALUE_PARAMETER name:value index:0 type:kotlin.Int flags:
diff --git a/compiler/testData/ir/irText/declarations/fakeOverrides.txt b/compiler/testData/ir/irText/declarations/fakeOverrides.txt
index 54bb160dc19..58e78056dc5 100644
--- a/compiler/testData/ir/irText/declarations/fakeOverrides.txt
+++ b/compiler/testData/ir/irText/declarations/fakeOverrides.txt
@@ -25,6 +25,7 @@ FILE fqName:<root> fileName:/fakeOverrides.kt
       CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
     PROPERTY name:bar type:kotlin.Int visibility:public modality:ABSTRACT flags:val
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:IBar) returnType:Int flags:
+        correspondingProperty: PROPERTY name:bar type:kotlin.Int visibility:public modality:ABSTRACT flags:val
         $this: VALUE_PARAMETER name:<this> type:IBar flags:
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags:
       overridden:
@@ -83,6 +84,7 @@ FILE fqName:<root> fileName:/fakeOverrides.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=42
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:OPEN <> ($this:Test1) returnType:Int flags:
+        correspondingProperty: PROPERTY name:bar type:kotlin.Int visibility:public modality:OPEN flags:val
         overridden:
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:IBar) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:Test1 flags:
diff --git a/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt b/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt
index b41e070ee88..5b110003522 100644
--- a/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt
@@ -11,6 +11,7 @@ FILE fqName:<root> fileName:/fileWithAnnotations.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=42
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:bar type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-bar>(): Int'
           GET_FIELD 'bar: Int' type=kotlin.Int origin=null
diff --git a/compiler/testData/ir/irText/declarations/interfaceProperties.txt b/compiler/testData/ir/irText/declarations/interfaceProperties.txt
index df4d97be241..628f89bcbf6 100644
--- a/compiler/testData/ir/irText/declarations/interfaceProperties.txt
+++ b/compiler/testData/ir/irText/declarations/interfaceProperties.txt
@@ -5,26 +5,32 @@ FILE fqName:<root> fileName:/interfaceProperties.kt
       CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
     PROPERTY name:test1 type:kotlin.Int visibility:public modality:ABSTRACT flags:val
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:ABSTRACT <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:test1 type:kotlin.Int visibility:public modality:ABSTRACT flags:val
         $this: VALUE_PARAMETER name:<this> type:C flags:
     PROPERTY name:test2 type:kotlin.Int visibility:public modality:OPEN flags:val
       FUN name:<get-test2> visibility:public modality:OPEN <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:test2 type:kotlin.Int visibility:public modality:OPEN flags:val
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test2>(): Int'
             CONST Int type=kotlin.Int value=0
     PROPERTY name:test3 type:kotlin.Int visibility:public modality:ABSTRACT flags:var
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:ABSTRACT <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:test3 type:kotlin.Int visibility:public modality:ABSTRACT flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-test3> visibility:public modality:ABSTRACT <> ($this:C, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:test3 type:kotlin.Int visibility:public modality:ABSTRACT flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
     PROPERTY name:test4 type:kotlin.Int visibility:public modality:OPEN flags:var
       FUN name:<get-test4> visibility:public modality:OPEN <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:test4 type:kotlin.Int visibility:public modality:OPEN flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test4>(): Int'
             CONST Int type=kotlin.Int value=0
       FUN name:<set-test4> visibility:public modality:OPEN <> ($this:C, value:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:test4 type:kotlin.Int visibility:public modality:OPEN flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         VALUE_PARAMETER name:value index:0 type:kotlin.Int flags:
         BLOCK_BODY
diff --git a/compiler/testData/ir/irText/declarations/localClassWithOverrides.txt b/compiler/testData/ir/irText/declarations/localClassWithOverrides.txt
index 8e7247ad865..50d6482a2eb 100644
--- a/compiler/testData/ir/irText/declarations/localClassWithOverrides.txt
+++ b/compiler/testData/ir/irText/declarations/localClassWithOverrides.txt
@@ -13,11 +13,14 @@ FILE fqName:<root> fileName:/localClassWithOverrides.kt
           $this: VALUE_PARAMETER name:<this> type:outer.ALocal flags:
         PROPERTY name:aval type:kotlin.Int visibility:public modality:ABSTRACT flags:val
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-aval> visibility:public modality:ABSTRACT <> ($this:outer.ALocal) returnType:Int flags:
+            correspondingProperty: PROPERTY name:aval type:kotlin.Int visibility:public modality:ABSTRACT flags:val
             $this: VALUE_PARAMETER name:<this> type:outer.ALocal flags:
         PROPERTY name:avar type:kotlin.Int visibility:public modality:ABSTRACT flags:var
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-avar> visibility:public modality:ABSTRACT <> ($this:outer.ALocal) returnType:Int flags:
+            correspondingProperty: PROPERTY name:avar type:kotlin.Int visibility:public modality:ABSTRACT flags:var
             $this: VALUE_PARAMETER name:<this> type:outer.ALocal flags:
           FUN DEFAULT_PROPERTY_ACCESSOR name:<set-avar> visibility:public modality:ABSTRACT <> ($this:outer.ALocal, <set-?>:kotlin.Int) returnType:Unit flags:
+            correspondingProperty: PROPERTY name:avar type:kotlin.Int visibility:public modality:ABSTRACT flags:var
             $this: VALUE_PARAMETER name:<this> type:outer.ALocal flags:
             VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags:
@@ -51,6 +54,7 @@ FILE fqName:<root> fileName:/localClassWithOverrides.kt
             EXPRESSION_BODY
               CONST Int type=kotlin.Int value=1
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-aval> visibility:public modality:OPEN <> ($this:outer.Local) returnType:Int flags:
+            correspondingProperty: PROPERTY name:aval type:kotlin.Int visibility:public modality:OPEN flags:val
             overridden:
               FUN DEFAULT_PROPERTY_ACCESSOR name:<get-aval> visibility:public modality:ABSTRACT <> ($this:outer.ALocal) returnType:Int flags:
             $this: VALUE_PARAMETER name:<this> type:outer.Local flags:
@@ -63,6 +67,7 @@ FILE fqName:<root> fileName:/localClassWithOverrides.kt
             EXPRESSION_BODY
               CONST Int type=kotlin.Int value=2
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-avar> visibility:public modality:OPEN <> ($this:outer.Local) returnType:Int flags:
+            correspondingProperty: PROPERTY name:avar type:kotlin.Int visibility:public modality:OPEN flags:var
             overridden:
               FUN DEFAULT_PROPERTY_ACCESSOR name:<get-avar> visibility:public modality:ABSTRACT <> ($this:outer.ALocal) returnType:Int flags:
             $this: VALUE_PARAMETER name:<this> type:outer.Local flags:
@@ -71,6 +76,7 @@ FILE fqName:<root> fileName:/localClassWithOverrides.kt
                 GET_FIELD 'avar: Int' type=kotlin.Int origin=null
                   receiver: GET_VAR 'this@Local: Local' type=outer.Local origin=null
           FUN DEFAULT_PROPERTY_ACCESSOR name:<set-avar> visibility:public modality:OPEN <> ($this:outer.Local, <set-?>:kotlin.Int) returnType:Unit flags:
+            correspondingProperty: PROPERTY name:avar type:kotlin.Int visibility:public modality:OPEN flags:var
             overridden:
               FUN DEFAULT_PROPERTY_ACCESSOR name:<set-avar> visibility:public modality:ABSTRACT <> ($this:outer.ALocal, <set-?>:kotlin.Int) returnType:Unit flags:
             $this: VALUE_PARAMETER name:<this> type:outer.Local flags:
diff --git a/compiler/testData/ir/irText/declarations/localDelegatedPropertyWithSuspendOperators.txt b/compiler/testData/ir/irText/declarations/localDelegatedPropertyWithSuspendOperators.txt
index 53309774552..90fc4d8e385 100644
--- a/compiler/testData/ir/irText/declarations/localDelegatedPropertyWithSuspendOperators.txt
+++ b/compiler/testData/ir/irText/declarations/localDelegatedPropertyWithSuspendOperators.txt
@@ -12,12 +12,14 @@ FILE fqName:<root> fileName:/localDelegatedPropertyWithSuspendOperators.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=42
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-z> visibility:public modality:FINAL <> ($this:A) returnType:Int flags:
+        correspondingProperty: PROPERTY name:z type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:A flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-z>(): Int'
             GET_FIELD 'z: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@A: A' type=A origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-z> visibility:public modality:FINAL <> ($this:A, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:z type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:A flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.txt
index 731d14ff2b7..cae5d863bd2 100644
--- a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.txt
+++ b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.txt
@@ -33,11 +33,13 @@ FILE fqName:<root> fileName:/expectedEnumClass.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<MyEnum> flags:
     PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<MyEnum>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<MyEnum> flags:
     PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<MyEnum>) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<MyEnum> flags:
@@ -93,11 +95,13 @@ FILE fqName:<root> fileName:/expectedEnumClass.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<MyEnum> flags:
     PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<MyEnum>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<MyEnum> flags:
     PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<MyEnum>) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<MyEnum> flags:
diff --git a/compiler/testData/ir/irText/declarations/packageLevelProperties.txt b/compiler/testData/ir/irText/declarations/packageLevelProperties.txt
index 46951b7a1cc..05bb0348cc7 100644
--- a/compiler/testData/ir/irText/declarations/packageLevelProperties.txt
+++ b/compiler/testData/ir/irText/declarations/packageLevelProperties.txt
@@ -4,11 +4,13 @@ FILE fqName:<root> fileName:/packageLevelProperties.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=0
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): Int'
           GET_FIELD 'test1: Int' type=kotlin.Int origin=null
   PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:val
     FUN name:<get-test2> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): Int'
           CONST Int type=kotlin.Int value=0
@@ -17,10 +19,12 @@ FILE fqName:<root> fileName:/packageLevelProperties.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=0
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test3 type:kotlin.Int visibility:public modality:FINAL flags:var
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test3>(): Int'
           GET_FIELD 'test3: Int' type=kotlin.Int origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<set-test3> visibility:public modality:FINAL <> (<set-?>:kotlin.Int) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:test3 type:kotlin.Int visibility:public modality:FINAL flags:var
       VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
       BLOCK_BODY
         SET_FIELD 'test3: Int' type=kotlin.Unit origin=null
@@ -30,10 +34,12 @@ FILE fqName:<root> fileName:/packageLevelProperties.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=1
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test4> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test4 type:kotlin.Int visibility:public modality:FINAL flags:var
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test4>(): Int'
           GET_FIELD 'test4: Int' type=kotlin.Int origin=null
     FUN name:<set-test4> visibility:public modality:FINAL <> (value:kotlin.Int) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:test4 type:kotlin.Int visibility:public modality:FINAL flags:var
       VALUE_PARAMETER name:value index:0 type:kotlin.Int flags:
       BLOCK_BODY
         SET_FIELD 'test4: Int' type=kotlin.Unit origin=EQ
@@ -43,10 +49,12 @@ FILE fqName:<root> fileName:/packageLevelProperties.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=1
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test5> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test5 type:kotlin.Int visibility:public modality:FINAL flags:var
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test5>(): Int'
           GET_FIELD 'test5: Int' type=kotlin.Int origin=null
     FUN name:<set-test5> visibility:private modality:FINAL <> (<set-?>:kotlin.Int) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:test5 type:kotlin.Int visibility:public modality:FINAL flags:var
       VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
       BLOCK_BODY
         SET_FIELD 'test5: Int' type=kotlin.Unit origin=null
@@ -56,6 +64,7 @@ FILE fqName:<root> fileName:/packageLevelProperties.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=1
     FUN name:<get-test6> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test6 type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test6>(): Int'
           GET_FIELD 'test6: Int' type=kotlin.Int origin=null
@@ -71,6 +80,7 @@ FILE fqName:<root> fileName:/packageLevelProperties.kt
                   CONST Int type=kotlin.Int value=42
             FUNCTION_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int origin=LAMBDA
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-test7> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test7 type:kotlin.Int visibility:public modality:FINAL flags:delegated,val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test7>(): Int'
           CALL 'getValue(Any?, KProperty<*>) on Lazy<Int>: Int' type=kotlin.Int origin=null
@@ -85,6 +95,7 @@ FILE fqName:<root> fileName:/packageLevelProperties.kt
           <K>: String
           <V>: Int
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-test8> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test8 type:kotlin.Int visibility:public modality:FINAL flags:delegated,var
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test8>(): Int'
           CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, out Int>: Int' type=kotlin.Int origin=null
@@ -94,6 +105,7 @@ FILE fqName:<root> fileName:/packageLevelProperties.kt
             thisRef: CONST Null type=kotlin.Nothing? value=null
             property: PROPERTY_REFERENCE 'test8: Int' field=null getter='<get-test8>(): Int' setter='<set-test8>(Int): Unit' type=kotlin.reflect.KMutableProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
     FUN DELEGATED_PROPERTY_ACCESSOR name:<set-test8> visibility:public modality:FINAL <> (<set-?>:kotlin.Int) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:test8 type:kotlin.Int visibility:public modality:FINAL flags:delegated,var
       VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<set-test8>(Int): Unit'
diff --git a/compiler/testData/ir/irText/declarations/parameters/constructor.txt b/compiler/testData/ir/irText/declarations/parameters/constructor.txt
index a81891cb9ee..465f224dd86 100644
--- a/compiler/testData/ir/irText/declarations/parameters/constructor.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/constructor.txt
@@ -20,6 +20,7 @@ FILE fqName:<root> fileName:/constructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: T1' type=T1 origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test1<T1, T2>) returnType:T1 flags:
+        correspondingProperty: PROPERTY name:x type:T1 visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1<T1, T2> flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): T1'
@@ -30,6 +31,7 @@ FILE fqName:<root> fileName:/constructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: T2' type=T2 origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:Test1<T1, T2>) returnType:T2 flags:
+        correspondingProperty: PROPERTY name:y type:T2 visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1<T1, T2> flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): T2'
@@ -63,6 +65,7 @@ FILE fqName:<root> fileName:/constructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:Test2) returnType:String flags:
+        correspondingProperty: PROPERTY name:y type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test2 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): String'
@@ -86,6 +89,7 @@ FILE fqName:<root> fileName:/constructor.kt
           EXPRESSION_BODY
             GET_VAR 'value-parameter z: Z' type=Z origin=INITIALIZE_PROPERTY_FROM_PARAMETER
         FUN DEFAULT_PROPERTY_ACCESSOR name:<get-z> visibility:public modality:FINAL <> ($this:Test2.TestInner<Z>) returnType:Z flags:
+          correspondingProperty: PROPERTY name:z type:Z visibility:public modality:FINAL flags:val
           $this: VALUE_PARAMETER name:<this> type:Test2.TestInner<Z> flags:
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-z>(): Z'
@@ -143,6 +147,7 @@ FILE fqName:<root> fileName:/constructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test3) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test3 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -153,6 +158,7 @@ FILE fqName:<root> fileName:/constructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: String = ...' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:Test3) returnType:String flags:
+        correspondingProperty: PROPERTY name:y type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test3 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): String'
@@ -188,6 +194,7 @@ FILE fqName:<root> fileName:/constructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test4<T>) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test4<T> flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
diff --git a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt
index 5fb3506b0ed..9e1aa7d6bf9 100644
--- a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt
@@ -19,6 +19,7 @@ FILE fqName:<root> fileName:/dataClassMembers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: T' type=T origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test<T>) returnType:T flags:
+        correspondingProperty: PROPERTY name:x type:T visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test<T> flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): T'
@@ -29,6 +30,7 @@ FILE fqName:<root> fileName:/dataClassMembers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: String = ...' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:Test<T>) returnType:String flags:
+        correspondingProperty: PROPERTY name:y type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test<T> flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): String'
diff --git a/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt b/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt
index 7350fb33b72..a36c36df8c7 100644
--- a/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt
@@ -4,6 +4,7 @@ FILE fqName:<root> fileName:/defaultPropertyAccessors.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=42
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): Int'
           GET_FIELD 'test1: Int' type=kotlin.Int origin=null
@@ -12,10 +13,12 @@ FILE fqName:<root> fileName:/defaultPropertyAccessors.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=42
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:var
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): Int'
           GET_FIELD 'test2: Int' type=kotlin.Int origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<set-test2> visibility:public modality:FINAL <> (<set-?>:kotlin.Int) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:var
       VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
       BLOCK_BODY
         SET_FIELD 'test2: Int' type=kotlin.Unit origin=null
@@ -33,6 +36,7 @@ FILE fqName:<root> fileName:/defaultPropertyAccessors.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=42
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testMember1> visibility:public modality:FINAL <> ($this:Host) returnType:Int flags:
+        correspondingProperty: PROPERTY name:testMember1 type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Host flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-testMember1>(): Int'
@@ -43,12 +47,14 @@ FILE fqName:<root> fileName:/defaultPropertyAccessors.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=42
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testMember2> visibility:public modality:FINAL <> ($this:Host) returnType:Int flags:
+        correspondingProperty: PROPERTY name:testMember2 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:Host flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-testMember2>(): Int'
             GET_FIELD 'testMember2: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@Host: Host' type=Host origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-testMember2> visibility:public modality:FINAL <> ($this:Host, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:testMember2 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:Host flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
@@ -88,6 +94,7 @@ FILE fqName:<root> fileName:/defaultPropertyAccessors.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter testInPrimaryCtor1: T' type=T origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testInPrimaryCtor1> visibility:public modality:FINAL <> ($this:InPrimaryCtor<T>) returnType:T flags:
+        correspondingProperty: PROPERTY name:testInPrimaryCtor1 type:T visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:InPrimaryCtor<T> flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-testInPrimaryCtor1>(): T'
@@ -98,12 +105,14 @@ FILE fqName:<root> fileName:/defaultPropertyAccessors.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter testInPrimaryCtor2: Int = ...' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testInPrimaryCtor2> visibility:public modality:FINAL <> ($this:InPrimaryCtor<T>) returnType:Int flags:
+        correspondingProperty: PROPERTY name:testInPrimaryCtor2 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:InPrimaryCtor<T> flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-testInPrimaryCtor2>(): Int'
             GET_FIELD 'testInPrimaryCtor2: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@InPrimaryCtor: InPrimaryCtor<T>' type=InPrimaryCtor<T> origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-testInPrimaryCtor2> visibility:public modality:FINAL <> ($this:InPrimaryCtor<T>, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:testInPrimaryCtor2 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:InPrimaryCtor<T> flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
diff --git a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.txt b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.txt
index a8e6063dce4..9b3fede09da 100644
--- a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.txt
@@ -11,6 +11,7 @@ FILE fqName:<root> fileName:/delegatedMembers.kt
       VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:
     PROPERTY name:bar type:kotlin.Int visibility:public modality:ABSTRACT flags:val
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:IBase<T>) returnType:Int flags:
+        correspondingProperty: PROPERTY name:bar type:kotlin.Int visibility:public modality:ABSTRACT flags:val
         $this: VALUE_PARAMETER name:<this> type:IBase<T> flags:
     FUN name:qux visibility:public modality:ABSTRACT <X> ($this:IBase<T>, t:T, x:X) returnType:Unit flags:
       TYPE_PARAMETER name:X index:0 variance: upperBounds:[kotlin.Any?]
@@ -75,6 +76,7 @@ FILE fqName:<root> fileName:/delegatedMembers.kt
           x: GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
     PROPERTY DELEGATED_MEMBER name:bar type:kotlin.Int visibility:public modality:OPEN flags:val
       FUN DELEGATED_MEMBER name:<get-bar> visibility:public modality:OPEN <> ($this:Test<TT>) returnType:Int flags:
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:bar type:kotlin.Int visibility:public modality:OPEN flags:val
         overridden:
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:IBase<T>) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:Test<TT> flags:
diff --git a/compiler/testData/ir/irText/declarations/parameters/lambdas.txt b/compiler/testData/ir/irText/declarations/parameters/lambdas.txt
index ef0befd73a9..1f1f11bd9b6 100644
--- a/compiler/testData/ir/irText/declarations/parameters/lambdas.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/lambdas.txt
@@ -10,6 +10,7 @@ FILE fqName:<root> fileName:/lambdas.kt
                 GET_VAR 'value-parameter it: String' type=kotlin.String origin=null
           FUNCTION_REFERENCE '<anonymous>(String): String' type=(kotlin.String) -> kotlin.String origin=LAMBDA
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:Function1<String, String> flags:
+      correspondingProperty: PROPERTY name:test1 type:(kotlin.String) -> kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): (String) -> String'
           GET_FIELD 'test1: (String) -> String' type=(kotlin.String) -> kotlin.String origin=null
@@ -26,6 +27,7 @@ FILE fqName:<root> fileName:/lambdas.kt
                   $this: GET_VAR 'value-parameter it: Any' type=kotlin.Any origin=null
           FUNCTION_REFERENCE '<anonymous>(Any) on Any: Int' type=kotlin.Any.(kotlin.Any) -> kotlin.Int origin=LAMBDA
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:[@kotlin.ExtensionFunctionType] Function2<Any, Any, Any> flags:
+      correspondingProperty: PROPERTY name:test2 type:kotlin.Any.(kotlin.Any) -> kotlin.Any visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): Any.(Any) -> Any'
           GET_FIELD 'test2: Any.(Any) -> Any' type=kotlin.Any.(kotlin.Any) -> kotlin.Any origin=null
@@ -41,6 +43,7 @@ FILE fqName:<root> fileName:/lambdas.kt
                 GET_OBJECT 'Unit' type=kotlin.Unit
           FUNCTION_REFERENCE '<anonymous>(Int, Int): Unit' type=(kotlin.Int, kotlin.Int) -> kotlin.Unit origin=LAMBDA
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> () returnType:Function2<Int, Int, Unit> flags:
+      correspondingProperty: PROPERTY name:test3 type:(kotlin.Int, kotlin.Int) -> kotlin.Unit visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test3>(): (Int, Int) -> Unit'
           GET_FIELD 'test3: (Int, Int) -> Unit' type=(kotlin.Int, kotlin.Int) -> kotlin.Unit origin=null
@@ -54,6 +57,7 @@ FILE fqName:<root> fileName:/lambdas.kt
             BLOCK_BODY
           FUNCTION_REFERENCE '<no name provided>(Int, Int): Unit' type=(kotlin.Int, kotlin.Int) -> kotlin.Unit origin=ANONYMOUS_FUNCTION
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test4> visibility:public modality:FINAL <> () returnType:Function2<Int, Int, Unit> flags:
+      correspondingProperty: PROPERTY name:test4 type:(kotlin.Int, kotlin.Int) -> kotlin.Unit visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test4>(): (Int, Int) -> Unit'
           GET_FIELD 'test4: (Int, Int) -> Unit' type=(kotlin.Int, kotlin.Int) -> kotlin.Unit origin=null
diff --git a/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.txt b/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.txt
index 50cdd347af7..4255273317e 100644
--- a/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.txt
@@ -1,35 +1,42 @@
 FILE fqName:<root> fileName:/propertyAccessors.kt
   PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:val
     FUN name:<get-test1> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): Int'
           CONST Int type=kotlin.Int value=42
   PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:var
     FUN name:<get-test2> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:var
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): Int'
           CONST Int type=kotlin.Int value=42
     FUN name:<set-test2> visibility:public modality:FINAL <> (value:kotlin.Int) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:var
       VALUE_PARAMETER name:value index:0 type:kotlin.Int flags:
       BLOCK_BODY
   PROPERTY name:testExt1 type:kotlin.Int visibility:public modality:FINAL flags:val
     FUN name:<get-testExt1> visibility:public modality:FINAL <> ($receiver:kotlin.String) returnType:Int flags:
+      correspondingProperty: PROPERTY name:testExt1 type:kotlin.Int visibility:public modality:FINAL flags:val
       $receiver: VALUE_PARAMETER name:<this> type:kotlin.String flags:
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testExt1>() on String: Int'
           CONST Int type=kotlin.Int value=42
   PROPERTY name:testExt2 type:kotlin.Int visibility:public modality:FINAL flags:var
     FUN name:<get-testExt2> visibility:public modality:FINAL <> ($receiver:kotlin.String) returnType:Int flags:
+      correspondingProperty: PROPERTY name:testExt2 type:kotlin.Int visibility:public modality:FINAL flags:var
       $receiver: VALUE_PARAMETER name:<this> type:kotlin.String flags:
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testExt2>() on String: Int'
           CONST Int type=kotlin.Int value=42
     FUN name:<set-testExt2> visibility:public modality:FINAL <> ($receiver:kotlin.String, value:kotlin.Int) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:testExt2 type:kotlin.Int visibility:public modality:FINAL flags:var
       $receiver: VALUE_PARAMETER name:<this> type:kotlin.String flags:
       VALUE_PARAMETER name:value index:0 type:kotlin.Int flags:
       BLOCK_BODY
   PROPERTY name:testExt3 type:kotlin.Int visibility:public modality:FINAL flags:val
     FUN name:<get-testExt3> visibility:public modality:FINAL <T> ($receiver:T) returnType:Int flags:
+      correspondingProperty: PROPERTY name:testExt3 type:kotlin.Int visibility:public modality:FINAL flags:val
       TYPE_PARAMETER name:T index:0 variance: upperBounds:[kotlin.Any?]
         superClassifiers:
           CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
@@ -39,6 +46,7 @@ FILE fqName:<root> fileName:/propertyAccessors.kt
           CONST Int type=kotlin.Int value=42
   PROPERTY name:testExt4 type:kotlin.Int visibility:public modality:FINAL flags:var
     FUN name:<get-testExt4> visibility:public modality:FINAL <T> ($receiver:T) returnType:Int flags:
+      correspondingProperty: PROPERTY name:testExt4 type:kotlin.Int visibility:public modality:FINAL flags:var
       TYPE_PARAMETER name:T index:0 variance: upperBounds:[kotlin.Any?]
         superClassifiers:
           CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
@@ -47,6 +55,7 @@ FILE fqName:<root> fileName:/propertyAccessors.kt
         RETURN type=kotlin.Nothing from='<get-testExt4>() on T: Int'
           CONST Int type=kotlin.Int value=42
     FUN name:<set-testExt4> visibility:public modality:FINAL <T> ($receiver:T, value:kotlin.Int) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:testExt4 type:kotlin.Int visibility:public modality:FINAL flags:var
       TYPE_PARAMETER name:T index:0 variance: upperBounds:[kotlin.Any?]
         superClassifiers:
           CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
@@ -66,22 +75,26 @@ FILE fqName:<root> fileName:/propertyAccessors.kt
         INSTANCE_INITIALIZER_CALL classDescriptor='Host'
     PROPERTY name:testMem1 type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN name:<get-testMem1> visibility:public modality:FINAL <> ($this:Host<T>) returnType:Int flags:
+        correspondingProperty: PROPERTY name:testMem1 type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Host<T> flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-testMem1>(): Int'
             CONST Int type=kotlin.Int value=42
     PROPERTY name:testMem2 type:kotlin.Int visibility:public modality:FINAL flags:var
       FUN name:<get-testMem2> visibility:public modality:FINAL <> ($this:Host<T>) returnType:Int flags:
+        correspondingProperty: PROPERTY name:testMem2 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:Host<T> flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-testMem2>(): Int'
             CONST Int type=kotlin.Int value=42
       FUN name:<set-testMem2> visibility:public modality:FINAL <> ($this:Host<T>, value:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:testMem2 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:Host<T> flags:
         VALUE_PARAMETER name:value index:0 type:kotlin.Int flags:
         BLOCK_BODY
     PROPERTY name:testMemExt1 type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN name:<get-testMemExt1> visibility:public modality:FINAL <> ($this:Host<T>, $receiver:kotlin.String) returnType:Int flags:
+        correspondingProperty: PROPERTY name:testMemExt1 type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Host<T> flags:
         $receiver: VALUE_PARAMETER name:<this> type:kotlin.String flags:
         BLOCK_BODY
@@ -89,18 +102,21 @@ FILE fqName:<root> fileName:/propertyAccessors.kt
             CONST Int type=kotlin.Int value=42
     PROPERTY name:testMemExt2 type:kotlin.Int visibility:public modality:FINAL flags:var
       FUN name:<get-testMemExt2> visibility:public modality:FINAL <> ($this:Host<T>, $receiver:kotlin.String) returnType:Int flags:
+        correspondingProperty: PROPERTY name:testMemExt2 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:Host<T> flags:
         $receiver: VALUE_PARAMETER name:<this> type:kotlin.String flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-testMemExt2>() on String: Int'
             CONST Int type=kotlin.Int value=42
       FUN name:<set-testMemExt2> visibility:public modality:FINAL <> ($this:Host<T>, $receiver:kotlin.String, value:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:testMemExt2 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:Host<T> flags:
         $receiver: VALUE_PARAMETER name:<this> type:kotlin.String flags:
         VALUE_PARAMETER name:value index:0 type:kotlin.Int flags:
         BLOCK_BODY
     PROPERTY name:testMemExt3 type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN name:<get-testMemExt3> visibility:public modality:FINAL <TT> ($this:Host<T>, $receiver:TT) returnType:Int flags:
+        correspondingProperty: PROPERTY name:testMemExt3 type:kotlin.Int visibility:public modality:FINAL flags:val
         TYPE_PARAMETER name:TT index:0 variance: upperBounds:[kotlin.Any?]
           superClassifiers:
             CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
@@ -111,6 +127,7 @@ FILE fqName:<root> fileName:/propertyAccessors.kt
             CONST Int type=kotlin.Int value=42
     PROPERTY name:testMemExt4 type:kotlin.Int visibility:public modality:FINAL flags:var
       FUN name:<get-testMemExt4> visibility:public modality:FINAL <TT> ($this:Host<T>, $receiver:TT) returnType:Int flags:
+        correspondingProperty: PROPERTY name:testMemExt4 type:kotlin.Int visibility:public modality:FINAL flags:var
         TYPE_PARAMETER name:TT index:0 variance: upperBounds:[kotlin.Any?]
           superClassifiers:
             CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
@@ -120,6 +137,7 @@ FILE fqName:<root> fileName:/propertyAccessors.kt
           RETURN type=kotlin.Nothing from='<get-testMemExt4>() on TT: Int'
             CONST Int type=kotlin.Int value=42
       FUN name:<set-testMemExt4> visibility:public modality:FINAL <TT> ($this:Host<T>, $receiver:TT, value:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:testMemExt4 type:kotlin.Int visibility:public modality:FINAL flags:var
         TYPE_PARAMETER name:TT index:0 variance: upperBounds:[kotlin.Any?]
           superClassifiers:
             CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
diff --git a/compiler/testData/ir/irText/declarations/parameters/typeParameterBeforeBound.txt b/compiler/testData/ir/irText/declarations/parameters/typeParameterBeforeBound.txt
index 920399f3f9c..e05c0ea104b 100644
--- a/compiler/testData/ir/irText/declarations/parameters/typeParameterBeforeBound.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/typeParameterBeforeBound.txt
@@ -36,6 +36,7 @@ FILE fqName:<root> fileName:/typeParameterBeforeBound.kt
     BLOCK_BODY
   PROPERTY name:test3 type:kotlin.Unit visibility:public modality:FINAL flags:var
     FUN name:<get-test3> visibility:public modality:FINAL <T, U> ($receiver:Test1<T, U>) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:test3 type:kotlin.Unit visibility:public modality:FINAL flags:var
       TYPE_PARAMETER name:T index:0 variance: upperBounds:[U]
         superClassifiers:
           TYPE_PARAMETER name:U index:1 variance: upperBounds:[kotlin.Any?]
@@ -45,6 +46,7 @@ FILE fqName:<root> fileName:/typeParameterBeforeBound.kt
       $receiver: VALUE_PARAMETER name:<this> type:Test1<T, U> flags:
       BLOCK_BODY
     FUN name:<set-test3> visibility:public modality:FINAL <T, U> ($receiver:Test1<T, U>, value:kotlin.Unit) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:test3 type:kotlin.Unit visibility:public modality:FINAL flags:var
       TYPE_PARAMETER name:T index:0 variance: upperBounds:[U]
         superClassifiers:
           TYPE_PARAMETER name:U index:1 variance: upperBounds:[kotlin.Any?]
diff --git a/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt b/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt
index e6f45b2574b..f25b2823270 100644
--- a/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt
+++ b/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt
@@ -15,6 +15,7 @@ FILE fqName:<root> fileName:/primaryCtorDefaultArguments.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int = ...' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
diff --git a/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt b/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt
index b20a622dcaf..8fb6176b519 100644
--- a/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt
+++ b/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt
@@ -14,6 +14,7 @@ FILE fqName:<root> fileName:/primaryCtorProperties.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter test1: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test1>(): Int'
@@ -24,12 +25,14 @@ FILE fqName:<root> fileName:/primaryCtorProperties.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter test2: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test2>(): Int'
             GET_FIELD 'test2: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@C: C' type=C origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-test2> visibility:public modality:FINAL <> ($this:C, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt b/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt
index 8f95a093a45..0600e332840 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt
@@ -13,6 +13,7 @@ FILE fqName:<root> fileName:/differentReceivers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:MyClass) returnType:String flags:
+        correspondingProperty: PROPERTY name:value type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:MyClass flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): String'
@@ -55,6 +56,7 @@ FILE fqName:<root> fileName:/differentReceivers.kt
           host: CONST Null type=kotlin.Nothing? value=null
           p: PROPERTY_REFERENCE 'testO: String' field=null getter='<get-testO>(): String' setter=null type=kotlin.reflect.KProperty0<kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-testO> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:testO type:kotlin.String visibility:public modality:FINAL flags:delegated,val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testO>(): String'
           CALL 'getValue(Any?, Any) on String: String' type=kotlin.String origin=null
@@ -66,6 +68,7 @@ FILE fqName:<root> fileName:/differentReceivers.kt
       EXPRESSION_BODY
         CONST String type=kotlin.String value=K
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-testK> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:testK type:kotlin.String visibility:public modality:FINAL flags:delegated,val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testK>(): String'
           CALL 'getValue(Any?, Any) on String: String' type=kotlin.String origin=null
@@ -79,6 +82,7 @@ FILE fqName:<root> fileName:/differentReceivers.kt
           $this: CALL '<get-testO>(): String' type=kotlin.String origin=GET_PROPERTY
           other: CALL '<get-testK>(): String' type=kotlin.String origin=GET_PROPERTY
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testOK> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:testOK type:kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testOK>(): String'
           GET_FIELD 'testOK: String' type=kotlin.String origin=null
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/local.txt b/compiler/testData/ir/irText/declarations/provideDelegate/local.txt
index fde42ba294e..43506284adb 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/local.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/local.txt
@@ -13,6 +13,7 @@ FILE fqName:<root> fileName:/local.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:Delegate) returnType:String flags:
+        correspondingProperty: PROPERTY name:value type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Delegate flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): String'
@@ -53,6 +54,7 @@ FILE fqName:<root> fileName:/local.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:DelegateProvider) returnType:String flags:
+        correspondingProperty: PROPERTY name:value type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:DelegateProvider flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): String'
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.txt b/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.txt
index d1a818b3943..caf9630546e 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.txt
@@ -13,6 +13,7 @@ FILE fqName:<root> fileName:/localDifferentReceivers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:MyClass) returnType:String flags:
+        correspondingProperty: PROPERTY name:value type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:MyClass flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): String'
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/member.txt b/compiler/testData/ir/irText/declarations/provideDelegate/member.txt
index 2b16c893d4b..089dc7b172d 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/member.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/member.txt
@@ -13,6 +13,7 @@ FILE fqName:<root> fileName:/member.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:Delegate) returnType:String flags:
+        correspondingProperty: PROPERTY name:value type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Delegate flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): String'
@@ -53,6 +54,7 @@ FILE fqName:<root> fileName:/member.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:DelegateProvider) returnType:String flags:
+        correspondingProperty: PROPERTY name:value type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:DelegateProvider flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): String'
@@ -97,6 +99,7 @@ FILE fqName:<root> fileName:/member.kt
             thisRef: GET_VAR 'this@Host: Host' type=Host origin=null
             property: PROPERTY_REFERENCE 'testMember: String' field=null getter='<get-testMember>(): String' setter=null type=kotlin.reflect.KProperty1<Host, kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
       FUN DELEGATED_PROPERTY_ACCESSOR name:<get-testMember> visibility:public modality:FINAL <> ($this:Host) returnType:String flags:
+        correspondingProperty: PROPERTY name:testMember type:kotlin.String visibility:public modality:FINAL flags:delegated,val
         $this: VALUE_PARAMETER name:<this> type:Host flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-testMember>(): String'
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt
index c85c9ae908f..145bd65f090 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt
@@ -21,6 +21,7 @@ FILE fqName:<root> fileName:/memberExtension.kt
           EXPRESSION_BODY
             GET_VAR 'value-parameter s: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
         FUN DEFAULT_PROPERTY_ACCESSOR name:<get-s> visibility:public modality:FINAL <> ($this:Host.StringDelegate) returnType:String flags:
+          correspondingProperty: PROPERTY name:s type:kotlin.String visibility:public modality:FINAL flags:val
           $this: VALUE_PARAMETER name:<this> type:Host.StringDelegate flags:
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-s>(): String'
@@ -67,6 +68,7 @@ FILE fqName:<root> fileName:/memberExtension.kt
             host: GET_VAR 'this@Host: Host' type=Host origin=null
             p: PROPERTY_REFERENCE 'plusK: String on String' field=null getter='<get-plusK>() on String: String' setter=null type=kotlin.reflect.KProperty2<kotlin.String, Host, kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
       FUN DELEGATED_PROPERTY_ACCESSOR name:<get-plusK> visibility:public modality:FINAL <> ($this:Host, $receiver:kotlin.String) returnType:String flags:
+        correspondingProperty: PROPERTY name:plusK type:kotlin.String visibility:public modality:FINAL flags:delegated,val
         $this: VALUE_PARAMETER name:<this> type:Host flags:
         $receiver: VALUE_PARAMETER name:<this> type:kotlin.String flags:
         BLOCK_BODY
@@ -83,6 +85,7 @@ FILE fqName:<root> fileName:/memberExtension.kt
             $this: GET_VAR 'this@Host: Host' type=Host origin=null
             $receiver: CONST String type=kotlin.String value=O
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-ok> visibility:public modality:FINAL <> ($this:Host) returnType:String flags:
+        correspondingProperty: PROPERTY name:ok type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Host flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-ok>(): String'
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt b/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt
index bfd7a073e38..7f111777050 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt
@@ -13,6 +13,7 @@ FILE fqName:<root> fileName:/topLevel.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:Delegate) returnType:String flags:
+        correspondingProperty: PROPERTY name:value type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Delegate flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): String'
@@ -53,6 +54,7 @@ FILE fqName:<root> fileName:/topLevel.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:DelegateProvider) returnType:String flags:
+        correspondingProperty: PROPERTY name:value type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:DelegateProvider flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): String'
@@ -89,6 +91,7 @@ FILE fqName:<root> fileName:/topLevel.kt
           thisRef: CONST Null type=kotlin.Nothing? value=null
           property: PROPERTY_REFERENCE 'testTopLevel: String' field=null getter='<get-testTopLevel>(): String' setter=null type=kotlin.reflect.KProperty0<kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-testTopLevel> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:testTopLevel type:kotlin.String visibility:public modality:FINAL flags:delegated,val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testTopLevel>(): String'
           CALL 'getValue(Any?, Any?): String' type=kotlin.String origin=null
diff --git a/compiler/testData/ir/irText/errors/unresolvedReference.txt b/compiler/testData/ir/irText/errors/unresolvedReference.txt
index 77de0f176a0..f9fb39be35e 100644
--- a/compiler/testData/ir/irText/errors/unresolvedReference.txt
+++ b/compiler/testData/ir/irText/errors/unresolvedReference.txt
@@ -4,6 +4,7 @@ FILE fqName:<root> fileName:/unresolvedReference.kt
       EXPRESSION_BODY
         ERROR_CALL '' type=[ERROR : ]
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:[ERROR : Type for unresolved] flags:
+      correspondingProperty: PROPERTY name:test1 type:[ERROR : Type for unresolved] visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): [ERROR : Type for unresolved]'
           GET_FIELD 'test1: [ERROR : Type for unresolved]' type=[ERROR : Type for unresolved] origin=null
@@ -12,6 +13,7 @@ FILE fqName:<root> fileName:/unresolvedReference.kt
       EXPRESSION_BODY
         ERROR_CALL '' type=[ERROR : ]
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:[ERROR : Unresolved] flags:
+      correspondingProperty: PROPERTY name:test2 type:[ERROR : Unresolved] visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): [ERROR : Unresolved]'
           GET_FIELD 'test2: [ERROR : Unresolved]' type=[ERROR : Unresolved] origin=null
@@ -22,6 +24,7 @@ FILE fqName:<root> fileName:/unresolvedReference.kt
           receiver: CONST Int type=kotlin.Int value=42
           CONST Int type=kotlin.Int value=56
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> () returnType:[ERROR : Type for 42.unresolved(56)] flags:
+      correspondingProperty: PROPERTY name:test3 type:[ERROR : Type for 42.unresolved(56)] visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test3>(): [ERROR : Type for 42.unresolved(56)]'
           GET_FIELD 'test3: [ERROR : Type for 42.unresolved(56)]' type=[ERROR : Type for 42.unresolved(56)] origin=null
@@ -30,6 +33,7 @@ FILE fqName:<root> fileName:/unresolvedReference.kt
       EXPRESSION_BODY
         ERROR_EXPR '' type=[ERROR : ]
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test4> visibility:public modality:FINAL <> () returnType:[ERROR : Type for 42 *] flags:
+      correspondingProperty: PROPERTY name:test4 type:[ERROR : Type for 42 *] visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test4>(): [ERROR : Type for 42 *]'
           GET_FIELD 'test4: [ERROR : Type for 42 *]' type=[ERROR : Type for 42 *] origin=null
diff --git a/compiler/testData/ir/irText/expressions/arrayAccess.txt b/compiler/testData/ir/irText/expressions/arrayAccess.txt
index 3f8f5ae9ebf..6525963a2d6 100644
--- a/compiler/testData/ir/irText/expressions/arrayAccess.txt
+++ b/compiler/testData/ir/irText/expressions/arrayAccess.txt
@@ -4,6 +4,7 @@ FILE fqName:<root> fileName:/arrayAccess.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=0
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-p> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:p type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-p>(): Int'
           GET_FIELD 'p: Int' type=kotlin.Int origin=null
diff --git a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt
index 35ea59914a7..a49e0a7b731 100644
--- a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt
+++ b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt
@@ -25,6 +25,7 @@ FILE fqName:<root> fileName:/arrayAugmentedAssignment1.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: IntArray' type=kotlin.IntArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:C) returnType:IntArray flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.IntArray visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): IntArray'
diff --git a/compiler/testData/ir/irText/expressions/assignments.txt b/compiler/testData/ir/irText/expressions/assignments.txt
index 333569aac7d..f93737b9976 100644
--- a/compiler/testData/ir/irText/expressions/assignments.txt
+++ b/compiler/testData/ir/irText/expressions/assignments.txt
@@ -13,12 +13,14 @@ FILE fqName:<root> fileName:/assignments.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Ref) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:Ref flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@Ref: Ref' type=Ref origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-x> visibility:public modality:FINAL <> ($this:Ref, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:Ref flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt
index a218bff47b6..c89599afd89 100644
--- a/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt
+++ b/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt
@@ -4,10 +4,12 @@ FILE fqName:<root> fileName:/augmentedAssignment1.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=0
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-p> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:p type:kotlin.Int visibility:public modality:FINAL flags:var
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-p>(): Int'
           GET_FIELD 'p: Int' type=kotlin.Int origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<set-p> visibility:public modality:FINAL <> (<set-?>:kotlin.Int) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:p type:kotlin.Int visibility:public modality:FINAL flags:var
       VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
       BLOCK_BODY
         SET_FIELD 'p: Int' type=kotlin.Unit origin=null
diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt
index d3b8f22da9f..4007fa34195 100644
--- a/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt
+++ b/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt
@@ -45,6 +45,7 @@ FILE fqName:<root> fileName:/augmentedAssignment2.kt
       EXPRESSION_BODY
         CALL 'constructor A()' type=A origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-p> visibility:public modality:FINAL <> () returnType:A flags:
+      correspondingProperty: PROPERTY name:p type:A visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-p>(): A'
           GET_FIELD 'p: A' type=A origin=null
diff --git a/compiler/testData/ir/irText/expressions/boundCallableReferences.txt b/compiler/testData/ir/irText/expressions/boundCallableReferences.txt
index 26ebb205d31..d478183ba38 100644
--- a/compiler/testData/ir/irText/expressions/boundCallableReferences.txt
+++ b/compiler/testData/ir/irText/expressions/boundCallableReferences.txt
@@ -15,6 +15,7 @@ FILE fqName:<root> fileName:/boundCallableReferences.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=0
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:FINAL <> ($this:A) returnType:Int flags:
+        correspondingProperty: PROPERTY name:bar type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-bar>(): Int'
@@ -42,6 +43,7 @@ FILE fqName:<root> fileName:/boundCallableReferences.kt
         FUNCTION_REFERENCE 'foo(): Unit' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null
           $this: CALL 'constructor A()' type=A origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:KFunction0<Unit> flags:
+      correspondingProperty: PROPERTY name:test1 type:kotlin.reflect.KFunction0<kotlin.Unit> visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): KFunction0<Unit>'
           GET_FIELD 'test1: KFunction0<Unit>' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null
@@ -51,6 +53,7 @@ FILE fqName:<root> fileName:/boundCallableReferences.kt
         PROPERTY_REFERENCE 'bar: Int' field=null getter='<get-bar>(): Int' setter=null type=kotlin.reflect.KProperty0<kotlin.Int> origin=null
           $this: CALL 'constructor A()' type=A origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:KProperty0<Int> flags:
+      correspondingProperty: PROPERTY name:test2 type:kotlin.reflect.KProperty0<kotlin.Int> visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): KProperty0<Int>'
           GET_FIELD 'test2: KProperty0<Int>' type=kotlin.reflect.KProperty0<kotlin.Int> origin=null
@@ -60,6 +63,7 @@ FILE fqName:<root> fileName:/boundCallableReferences.kt
         FUNCTION_REFERENCE 'qux() on A: Unit' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null
           $receiver: CALL 'constructor A()' type=A origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> () returnType:KFunction0<Unit> flags:
+      correspondingProperty: PROPERTY name:test3 type:kotlin.reflect.KFunction0<kotlin.Unit> visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test3>(): KFunction0<Unit>'
           GET_FIELD 'test3: KFunction0<Unit>' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null
diff --git a/compiler/testData/ir/irText/expressions/callableRefToGenericMember.txt b/compiler/testData/ir/irText/expressions/callableRefToGenericMember.txt
index 90dd7e4a81d..7c91827474b 100644
--- a/compiler/testData/ir/irText/expressions/callableRefToGenericMember.txt
+++ b/compiler/testData/ir/irText/expressions/callableRefToGenericMember.txt
@@ -18,6 +18,7 @@ FILE fqName:<root> fileName:/callableRefToGenericMember.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=42
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:FINAL <> ($this:A<T>) returnType:Int flags:
+        correspondingProperty: PROPERTY name:bar type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A<T> flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-bar>(): Int'
@@ -41,6 +42,7 @@ FILE fqName:<root> fileName:/callableRefToGenericMember.kt
       EXPRESSION_BODY
         FUNCTION_REFERENCE 'foo(): Unit' type=kotlin.reflect.KFunction1<A<kotlin.String>, kotlin.Unit> origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:KFunction1<A<String>, Unit> flags:
+      correspondingProperty: PROPERTY name:test1 type:kotlin.reflect.KFunction1<A<kotlin.String>, kotlin.Unit> visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): KFunction1<A<String>, Unit>'
           GET_FIELD 'test1: KFunction1<A<String>, Unit>' type=kotlin.reflect.KFunction1<A<kotlin.String>, kotlin.Unit> origin=null
@@ -49,6 +51,7 @@ FILE fqName:<root> fileName:/callableRefToGenericMember.kt
       EXPRESSION_BODY
         PROPERTY_REFERENCE 'bar: Int' field=null getter='<get-bar>(): Int' setter=null type=kotlin.reflect.KProperty1<A<kotlin.String>, kotlin.Int> origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:KProperty1<A<String>, Int> flags:
+      correspondingProperty: PROPERTY name:test2 type:kotlin.reflect.KProperty1<A<kotlin.String>, kotlin.Int> visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): KProperty1<A<String>, Int>'
           GET_FIELD 'test2: KProperty1<A<String>, Int>' type=kotlin.reflect.KProperty1<A<kotlin.String>, kotlin.Int> origin=null
diff --git a/compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.txt b/compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.txt
index 6eb62a4d0e8..17b7ea4a18f 100644
--- a/compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.txt
@@ -12,6 +12,7 @@ FILE fqName:test fileName:/callableReferenceToImportedFromObject.kt
         EXPRESSION_BODY
           CONST String type=kotlin.String value=
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-a> visibility:public modality:FINAL <> ($this:test.Foo) returnType:String flags:
+        correspondingProperty: PROPERTY name:a type:kotlin.String visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:test.Foo flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-a>(): String'
@@ -41,6 +42,7 @@ FILE fqName:test fileName:/callableReferenceToImportedFromObject.kt
         PROPERTY_REFERENCE 'a: String' field=null getter='<get-a>(): String' setter=null type=kotlin.reflect.KProperty0<kotlin.String> origin=null
           $this: GET_OBJECT 'Foo' type=test.Foo
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:KProperty0<String> flags:
+      correspondingProperty: PROPERTY name:test1 type:kotlin.reflect.KProperty0<kotlin.String> visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): KProperty0<String>'
           GET_FIELD 'test1: KProperty0<String>' type=kotlin.reflect.KProperty0<kotlin.String> origin=null
@@ -50,6 +52,7 @@ FILE fqName:test fileName:/callableReferenceToImportedFromObject.kt
         PROPERTY_REFERENCE 'a: String' field=null getter='<get-a>(): String' setter=null type=kotlin.reflect.KProperty0<kotlin.String> origin=null
           $this: GET_OBJECT 'Foo' type=test.Foo
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1a> visibility:public modality:FINAL <> () returnType:KProperty0<String> flags:
+      correspondingProperty: PROPERTY name:test1a type:kotlin.reflect.KProperty0<kotlin.String> visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1a>(): KProperty0<String>'
           GET_FIELD 'test1a: KProperty0<String>' type=kotlin.reflect.KProperty0<kotlin.String> origin=null
@@ -59,6 +62,7 @@ FILE fqName:test fileName:/callableReferenceToImportedFromObject.kt
         FUNCTION_REFERENCE 'foo(): String' type=kotlin.reflect.KFunction0<kotlin.String> origin=null
           $this: GET_OBJECT 'Foo' type=test.Foo
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:KFunction0<String> flags:
+      correspondingProperty: PROPERTY name:test2 type:kotlin.reflect.KFunction0<kotlin.String> visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): KFunction0<String>'
           GET_FIELD 'test2: KFunction0<String>' type=kotlin.reflect.KFunction0<kotlin.String> origin=null
@@ -68,6 +72,7 @@ FILE fqName:test fileName:/callableReferenceToImportedFromObject.kt
         FUNCTION_REFERENCE 'foo(): String' type=kotlin.reflect.KFunction0<kotlin.String> origin=null
           $this: GET_OBJECT 'Foo' type=test.Foo
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2a> visibility:public modality:FINAL <> () returnType:KFunction0<String> flags:
+      correspondingProperty: PROPERTY name:test2a type:kotlin.reflect.KFunction0<kotlin.String> visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2a>(): KFunction0<String>'
           GET_FIELD 'test2a: KFunction0<String>' type=kotlin.reflect.KFunction0<kotlin.String> origin=null
diff --git a/compiler/testData/ir/irText/expressions/castToTypeParameter.txt b/compiler/testData/ir/irText/expressions/castToTypeParameter.txt
index 37fa1f06aee..c7451cd5f7f 100644
--- a/compiler/testData/ir/irText/expressions/castToTypeParameter.txt
+++ b/compiler/testData/ir/irText/expressions/castToTypeParameter.txt
@@ -21,6 +21,7 @@ FILE fqName:<root> fileName:/castToTypeParameter.kt
           GET_VAR 'this@castExtFun: Any' type=kotlin.Any origin=null
   PROPERTY name:castExtVal type:T visibility:public modality:FINAL flags:val
     FUN name:<get-castExtVal> visibility:public modality:FINAL <T> ($receiver:T) returnType:T flags:
+      correspondingProperty: PROPERTY name:castExtVal type:T visibility:public modality:FINAL flags:val
       TYPE_PARAMETER name:T index:0 variance: upperBounds:[kotlin.Any?]
         superClassifiers:
           CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
@@ -81,6 +82,7 @@ FILE fqName:<root> fileName:/castToTypeParameter.kt
             GET_VAR 'this@castGenericMemberExtFun: Any' type=kotlin.Any origin=null
     PROPERTY name:castMemberExtVal type:T visibility:public modality:FINAL flags:val
       FUN name:<get-castMemberExtVal> visibility:public modality:FINAL <> ($this:Host<T>, $receiver:kotlin.Any) returnType:T flags:
+        correspondingProperty: PROPERTY name:castMemberExtVal type:T visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Host<T> flags:
         $receiver: VALUE_PARAMETER name:<this> type:kotlin.Any flags:
         BLOCK_BODY
@@ -90,6 +92,7 @@ FILE fqName:<root> fileName:/castToTypeParameter.kt
               GET_VAR 'this@castMemberExtVal: Any' type=kotlin.Any origin=null
     PROPERTY name:castGenericMemberExtVal type:TV visibility:public modality:FINAL flags:val
       FUN name:<get-castGenericMemberExtVal> visibility:public modality:FINAL <TV> ($this:Host<T>, $receiver:TV) returnType:TV flags:
+        correspondingProperty: PROPERTY name:castGenericMemberExtVal type:TV visibility:public modality:FINAL flags:val
         TYPE_PARAMETER name:TV index:0 variance: upperBounds:[kotlin.Any?]
           superClassifiers:
             CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
diff --git a/compiler/testData/ir/irText/expressions/coercionToUnit.txt b/compiler/testData/ir/irText/expressions/coercionToUnit.txt
index 64b6d583047..327895821a7 100644
--- a/compiler/testData/ir/irText/expressions/coercionToUnit.txt
+++ b/compiler/testData/ir/irText/expressions/coercionToUnit.txt
@@ -11,6 +11,7 @@ FILE fqName:<root> fileName:/coercionToUnit.kt
                   CONST Int type=kotlin.Int value=42
           FUNCTION_REFERENCE '<anonymous>(): Unit' type=() -> kotlin.Unit origin=LAMBDA
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:Function0<Unit> flags:
+      correspondingProperty: PROPERTY name:test1 type:() -> kotlin.Unit visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): () -> Unit'
           GET_FIELD 'test1: () -> Unit' type=() -> kotlin.Unit origin=null
diff --git a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt
index 1c2169d10a2..462697ad545 100644
--- a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt
+++ b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt
@@ -12,12 +12,14 @@ FILE fqName:<root> fileName:/complexAugmentedAssignment.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=0
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x1> visibility:public modality:FINAL <> ($this:X1) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x1 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:X1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x1>(): Int'
             GET_FIELD 'x1: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@X1: X1' type=X1 origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-x1> visibility:public modality:FINAL <> ($this:X1, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:x1 type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:X1 flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
@@ -37,12 +39,14 @@ FILE fqName:<root> fileName:/complexAugmentedAssignment.kt
           EXPRESSION_BODY
             CONST Int type=kotlin.Int value=0
         FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x2> visibility:public modality:FINAL <> ($this:X1.X2) returnType:Int flags:
+          correspondingProperty: PROPERTY name:x2 type:kotlin.Int visibility:public modality:FINAL flags:var
           $this: VALUE_PARAMETER name:<this> type:X1.X2 flags:
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-x2>(): Int'
               GET_FIELD 'x2: Int' type=kotlin.Int origin=null
                 receiver: GET_VAR 'this@X2: X2' type=X1.X2 origin=null
         FUN DEFAULT_PROPERTY_ACCESSOR name:<set-x2> visibility:public modality:FINAL <> ($this:X1.X2, <set-?>:kotlin.Int) returnType:Unit flags:
+          correspondingProperty: PROPERTY name:x2 type:kotlin.Int visibility:public modality:FINAL flags:var
           $this: VALUE_PARAMETER name:<this> type:X1.X2 flags:
           VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
           BLOCK_BODY
@@ -62,12 +66,14 @@ FILE fqName:<root> fileName:/complexAugmentedAssignment.kt
             EXPRESSION_BODY
               CONST Int type=kotlin.Int value=0
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x3> visibility:public modality:FINAL <> ($this:X1.X2.X3) returnType:Int flags:
+            correspondingProperty: PROPERTY name:x3 type:kotlin.Int visibility:public modality:FINAL flags:var
             $this: VALUE_PARAMETER name:<this> type:X1.X2.X3 flags:
             BLOCK_BODY
               RETURN type=kotlin.Nothing from='<get-x3>(): Int'
                 GET_FIELD 'x3: Int' type=kotlin.Int origin=null
                   receiver: GET_VAR 'this@X3: X3' type=X1.X2.X3 origin=null
           FUN DEFAULT_PROPERTY_ACCESSOR name:<set-x3> visibility:public modality:FINAL <> ($this:X1.X2.X3, <set-?>:kotlin.Int) returnType:Unit flags:
+            correspondingProperty: PROPERTY name:x3 type:kotlin.Int visibility:public modality:FINAL flags:var
             $this: VALUE_PARAMETER name:<this> type:X1.X2.X3 flags:
             VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
             BLOCK_BODY
@@ -201,12 +207,14 @@ FILE fqName:<root> fileName:/complexAugmentedAssignment.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter s: Int = ...' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-s> visibility:public modality:FINAL <> ($this:B) returnType:Int flags:
+        correspondingProperty: PROPERTY name:s type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:B flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-s>(): Int'
             GET_FIELD 's: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@B: B' type=B origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-s> visibility:public modality:FINAL <> ($this:B, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:s type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:B flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
diff --git a/compiler/testData/ir/irText/expressions/contructorCall.txt b/compiler/testData/ir/irText/expressions/contructorCall.txt
index 79c5972e71b..16e6ad92b89 100644
--- a/compiler/testData/ir/irText/expressions/contructorCall.txt
+++ b/compiler/testData/ir/irText/expressions/contructorCall.txt
@@ -25,6 +25,7 @@ FILE fqName:<root> fileName:/contructorCall.kt
       EXPRESSION_BODY
         CALL 'constructor A()' type=A origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:A flags:
+      correspondingProperty: PROPERTY name:test type:A visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test>(): A'
           GET_FIELD 'test: A' type=A origin=null
diff --git a/compiler/testData/ir/irText/expressions/elvis.txt b/compiler/testData/ir/irText/expressions/elvis.txt
index 6254144f508..a63a90eed0c 100644
--- a/compiler/testData/ir/irText/expressions/elvis.txt
+++ b/compiler/testData/ir/irText/expressions/elvis.txt
@@ -4,6 +4,7 @@ FILE fqName:<root> fileName:/elvis.kt
       EXPRESSION_BODY
         CONST Null type=kotlin.Nothing? value=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-p> visibility:public modality:FINAL <> () returnType:Any? flags:
+      correspondingProperty: PROPERTY name:p type:kotlin.Any? visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-p>(): Any?'
           GET_FIELD 'p: Any?' type=kotlin.Any? origin=null
diff --git a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt
index 30da5b3f9f7..b0a5447f8c5 100644
--- a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt
+++ b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt
@@ -23,6 +23,7 @@ FILE fqName:<root> fileName:/enumEntryAsReceiver.kt
             EXPRESSION_BODY
               CONST String type=kotlin.String value=OK
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value2> visibility:public modality:FINAL <> ($this:X.B) returnType:String flags:
+            correspondingProperty: PROPERTY name:value2 type:kotlin.String visibility:public modality:FINAL flags:val
             $this: VALUE_PARAMETER name:<this> type:X.B flags:
             BLOCK_BODY
               RETURN type=kotlin.Nothing from='<get-value2>(): String'
@@ -39,6 +40,7 @@ FILE fqName:<root> fileName:/enumEntryAsReceiver.kt
                         $this: GET_ENUM 'B' type=X.B
                 FUNCTION_REFERENCE '<anonymous>(): String' type=() -> kotlin.String origin=LAMBDA
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:OPEN <> ($this:X.B) returnType:Function0<String> flags:
+            correspondingProperty: PROPERTY name:value type:() -> kotlin.String visibility:public modality:OPEN flags:val
             overridden:
               FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:ABSTRACT <> ($this:X) returnType:Function0<String> flags:
             $this: VALUE_PARAMETER name:<this> type:X.B flags:
@@ -74,11 +76,13 @@ FILE fqName:<root> fileName:/enumEntryAsReceiver.kt
           $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<X> flags:
         PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<X>) returnType:String flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<X>) returnType:String flags:
             $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<X> flags:
         PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<X>) returnType:Int flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<X>) returnType:Int flags:
             $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<X> flags:
@@ -88,6 +92,7 @@ FILE fqName:<root> fileName:/enumEntryAsReceiver.kt
           $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<X> flags:
     PROPERTY name:value type:() -> kotlin.String visibility:public modality:ABSTRACT flags:val
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:ABSTRACT <> ($this:X) returnType:Function0<String> flags:
+        correspondingProperty: PROPERTY name:value type:() -> kotlin.String visibility:public modality:ABSTRACT flags:val
         $this: VALUE_PARAMETER name:<this> type:X flags:
     FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum<X>) returnType:Any flags:
       overridden:
@@ -117,11 +122,13 @@ FILE fqName:<root> fileName:/enumEntryAsReceiver.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<X> flags:
     PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<X>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<X> flags:
     PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<X>) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<X> flags:
diff --git a/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.txt b/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.txt
index c561b86f33c..dc0e3dda6cf 100644
--- a/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.txt
+++ b/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.txt
@@ -1,6 +1,7 @@
 FILE fqName:<root> fileName:/extensionPropertyGetterCall.kt
   PROPERTY name:okext type:kotlin.String visibility:public modality:FINAL flags:val
     FUN name:<get-okext> visibility:public modality:FINAL <> ($receiver:kotlin.String) returnType:String flags:
+      correspondingProperty: PROPERTY name:okext type:kotlin.String visibility:public modality:FINAL flags:val
       $receiver: VALUE_PARAMETER name:<this> type:kotlin.String flags:
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-okext>() on String: String'
diff --git a/compiler/testData/ir/irText/expressions/field.txt b/compiler/testData/ir/irText/expressions/field.txt
index fae97c94c32..a4995af72b4 100644
--- a/compiler/testData/ir/irText/expressions/field.txt
+++ b/compiler/testData/ir/irText/expressions/field.txt
@@ -4,10 +4,12 @@ FILE fqName:<root> fileName:/field.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=0
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testSimple> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:testSimple type:kotlin.Int visibility:public modality:FINAL flags:var
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testSimple>(): Int'
           GET_FIELD 'testSimple: Int' type=kotlin.Int origin=null
     FUN name:<set-testSimple> visibility:public modality:FINAL <> (value:kotlin.Int) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:testSimple type:kotlin.Int visibility:public modality:FINAL flags:var
       VALUE_PARAMETER name:value index:0 type:kotlin.Int flags:
       BLOCK_BODY
         SET_FIELD 'testSimple: Int' type=kotlin.Unit origin=EQ
@@ -17,10 +19,12 @@ FILE fqName:<root> fileName:/field.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=0
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testAugmented> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:testAugmented type:kotlin.Int visibility:public modality:FINAL flags:var
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testAugmented>(): Int'
           GET_FIELD 'testAugmented: Int' type=kotlin.Int origin=null
     FUN name:<set-testAugmented> visibility:public modality:FINAL <> (value:kotlin.Int) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:testAugmented type:kotlin.Int visibility:public modality:FINAL flags:var
       VALUE_PARAMETER name:value index:0 type:kotlin.Int flags:
       BLOCK_BODY
         SET_FIELD 'testAugmented: Int' type=kotlin.Unit origin=PLUSEQ
diff --git a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt
index 69e8c715514..dae8d61ef0a 100644
--- a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt
+++ b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt
@@ -34,12 +34,14 @@ FILE fqName:<root> fileName:/forWithImplicitReceivers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:IntCell) returnType:Int flags:
+        correspondingProperty: PROPERTY name:value type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:IntCell flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): Int'
             GET_FIELD 'value: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@IntCell: IntCell' type=IntCell origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-value> visibility:public modality:FINAL <> ($this:IntCell, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:value type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:IntCell flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
diff --git a/compiler/testData/ir/irText/expressions/genericPropertyCall.txt b/compiler/testData/ir/irText/expressions/genericPropertyCall.txt
index ff66b10fd61..e3a3c06bbaf 100644
--- a/compiler/testData/ir/irText/expressions/genericPropertyCall.txt
+++ b/compiler/testData/ir/irText/expressions/genericPropertyCall.txt
@@ -1,6 +1,7 @@
 FILE fqName:<root> fileName:/genericPropertyCall.kt
   PROPERTY name:id type:T visibility:public modality:FINAL flags:val
     FUN name:<get-id> visibility:public modality:FINAL <T> ($receiver:T) returnType:T flags:
+      correspondingProperty: PROPERTY name:id type:T visibility:public modality:FINAL flags:val
       TYPE_PARAMETER name:T index:0 variance: upperBounds:[kotlin.Any?]
         superClassifiers:
           CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
@@ -15,6 +16,7 @@ FILE fqName:<root> fileName:/genericPropertyCall.kt
           <`0>: String
           $receiver: CONST String type=kotlin.String value=abc
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:test type:kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test>(): String'
           GET_FIELD 'test: String' type=kotlin.String origin=null
diff --git a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.txt b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.txt
index 6a90d88dc41..dbb6e49a7e1 100644
--- a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.txt
+++ b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.txt
@@ -39,6 +39,7 @@ FILE fqName:<root> fileName:/implicitCastToTypeParameter.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any flags:
   PROPERTY name:asT type:T? visibility:public modality:FINAL flags:val
     FUN name:<get-asT> visibility:public modality:FINAL <T> ($receiver:Foo<T>) returnType:T? flags:inline
+      correspondingProperty: PROPERTY name:asT type:T? visibility:public modality:FINAL flags:val
       TYPE_PARAMETER name:T index:0 variance: upperBounds:[kotlin.Any]
         superClassifiers:
           CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
diff --git a/compiler/testData/ir/irText/expressions/incrementDecrement.txt b/compiler/testData/ir/irText/expressions/incrementDecrement.txt
index 25ac6895a3b..37a758ad7a4 100644
--- a/compiler/testData/ir/irText/expressions/incrementDecrement.txt
+++ b/compiler/testData/ir/irText/expressions/incrementDecrement.txt
@@ -4,10 +4,12 @@ FILE fqName:<root> fileName:/incrementDecrement.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=0
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-p> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:p type:kotlin.Int visibility:public modality:FINAL flags:var
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-p>(): Int'
           GET_FIELD 'p: Int' type=kotlin.Int origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<set-p> visibility:public modality:FINAL <> (<set-?>:kotlin.Int) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:p type:kotlin.Int visibility:public modality:FINAL flags:var
       VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
       BLOCK_BODY
         SET_FIELD 'p: Int' type=kotlin.Unit origin=null
@@ -21,6 +23,7 @@ FILE fqName:<root> fileName:/incrementDecrement.kt
             CONST Int type=kotlin.Int value=2
             CONST Int type=kotlin.Int value=3
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-arr> visibility:public modality:FINAL <> () returnType:IntArray flags:
+      correspondingProperty: PROPERTY name:arr type:kotlin.IntArray visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-arr>(): IntArray'
           GET_FIELD 'arr: IntArray' type=kotlin.IntArray origin=null
diff --git a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt
index 97d5338ff29..d1a76e8af1a 100644
--- a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt
+++ b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt
@@ -8,6 +8,7 @@ FILE fqName:<root> fileName:/jvmStaticFieldReference.kt
         x: CONST String type=kotlin.String value=testFun
   PROPERTY name:testProp type:kotlin.Any visibility:public modality:FINAL flags:var
     FUN name:<get-testProp> visibility:public modality:FINAL <> () returnType:Any flags:
+      correspondingProperty: PROPERTY name:testProp type:kotlin.Any visibility:public modality:FINAL flags:var
       BLOCK_BODY
         CALL 'println(String!): Unit' type=kotlin.Unit origin=null
           $this: TYPE_OP type=java.io.PrintStream origin=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream
@@ -17,6 +18,7 @@ FILE fqName:<root> fileName:/jvmStaticFieldReference.kt
         RETURN type=kotlin.Nothing from='<get-testProp>(): Any'
           CONST Int type=kotlin.Int value=42
     FUN name:<set-testProp> visibility:public modality:FINAL <> (value:kotlin.Any) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:testProp type:kotlin.Any visibility:public modality:FINAL flags:var
       VALUE_PARAMETER name:value index:0 type:kotlin.Any flags:
       BLOCK_BODY
         CALL 'println(String!): Unit' type=kotlin.Unit origin=null
@@ -46,6 +48,7 @@ FILE fqName:<root> fileName:/jvmStaticFieldReference.kt
                   x: CONST String type=kotlin.String value=TestClass/test
                 CONST Int type=kotlin.Int value=42
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> ($this:TestClass) returnType:Int flags:
+        correspondingProperty: PROPERTY name:test type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestClass flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test>(): Int'
diff --git a/compiler/testData/ir/irText/expressions/kt16904.txt b/compiler/testData/ir/irText/expressions/kt16904.txt
index 03c6f32543d..2f6c212ced7 100644
--- a/compiler/testData/ir/irText/expressions/kt16904.txt
+++ b/compiler/testData/ir/irText/expressions/kt16904.txt
@@ -12,6 +12,7 @@ FILE fqName:<root> fileName:/kt16904.kt
         EXPRESSION_BODY
           CALL 'constructor B()' type=B origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:A) returnType:B flags:
+        correspondingProperty: PROPERTY name:x type:B visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): B'
@@ -22,12 +23,14 @@ FILE fqName:<root> fileName:/kt16904.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=0
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:A) returnType:Int flags:
+        correspondingProperty: PROPERTY name:y type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:A flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
             GET_FIELD 'y: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@A: A' type=A origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-y> visibility:public modality:FINAL <> ($this:A, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:y type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:A flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
@@ -98,15 +101,18 @@ FILE fqName:<root> fileName:/kt16904.kt
               other: CONST Int type=kotlin.Int value=42
     PROPERTY FAKE_OVERRIDE name:x type:B visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-x> visibility:public modality:FINAL <> ($this:A) returnType:B flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:x type:B visibility:public modality:FINAL flags:val
         overridden:
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:A) returnType:B flags:
         $this: VALUE_PARAMETER name:<this> type:A flags:
     PROPERTY FAKE_OVERRIDE name:y type:kotlin.Int visibility:public modality:FINAL flags:var
       FUN FAKE_OVERRIDE name:<get-y> visibility:public modality:FINAL <> ($this:A) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:y type:kotlin.Int visibility:public modality:FINAL flags:var
         overridden:
           FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:A) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:A flags:
       FUN FAKE_OVERRIDE name:<set-y> visibility:public modality:FINAL <> ($this:A, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:y type:kotlin.Int visibility:public modality:FINAL flags:var
         overridden:
           FUN DEFAULT_PROPERTY_ACCESSOR name:<set-y> visibility:public modality:FINAL <> ($this:A, <set-?>:kotlin.Int) returnType:Unit flags:
         $this: VALUE_PARAMETER name:<this> type:A flags:
diff --git a/compiler/testData/ir/irText/expressions/literals.txt b/compiler/testData/ir/irText/expressions/literals.txt
index 3bc1b95e45f..d6a86b9bf33 100644
--- a/compiler/testData/ir/irText/expressions/literals.txt
+++ b/compiler/testData/ir/irText/expressions/literals.txt
@@ -4,6 +4,7 @@ FILE fqName:<root> fileName:/literals.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=1
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): Int'
           GET_FIELD 'test1: Int' type=kotlin.Int origin=null
@@ -12,6 +13,7 @@ FILE fqName:<root> fileName:/literals.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=-1
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): Int'
           GET_FIELD 'test2: Int' type=kotlin.Int origin=null
@@ -20,6 +22,7 @@ FILE fqName:<root> fileName:/literals.kt
       EXPRESSION_BODY
         CONST Boolean type=kotlin.Boolean value=true
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> () returnType:Boolean flags:
+      correspondingProperty: PROPERTY name:test3 type:kotlin.Boolean visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test3>(): Boolean'
           GET_FIELD 'test3: Boolean' type=kotlin.Boolean origin=null
@@ -28,6 +31,7 @@ FILE fqName:<root> fileName:/literals.kt
       EXPRESSION_BODY
         CONST Boolean type=kotlin.Boolean value=false
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test4> visibility:public modality:FINAL <> () returnType:Boolean flags:
+      correspondingProperty: PROPERTY name:test4 type:kotlin.Boolean visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test4>(): Boolean'
           GET_FIELD 'test4: Boolean' type=kotlin.Boolean origin=null
@@ -36,6 +40,7 @@ FILE fqName:<root> fileName:/literals.kt
       EXPRESSION_BODY
         CONST String type=kotlin.String value=abc
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test5> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:test5 type:kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test5>(): String'
           GET_FIELD 'test5: String' type=kotlin.String origin=null
@@ -44,6 +49,7 @@ FILE fqName:<root> fileName:/literals.kt
       EXPRESSION_BODY
         CONST Null type=kotlin.Nothing? value=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test6> visibility:public modality:FINAL <> () returnType:Nothing? flags:
+      correspondingProperty: PROPERTY name:test6 type:kotlin.Nothing? visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test6>(): Nothing?'
           GET_FIELD 'test6: Nothing?' type=kotlin.Nothing? origin=null
@@ -52,6 +58,7 @@ FILE fqName:<root> fileName:/literals.kt
       EXPRESSION_BODY
         CONST Long type=kotlin.Long value=1
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test7> visibility:public modality:FINAL <> () returnType:Long flags:
+      correspondingProperty: PROPERTY name:test7 type:kotlin.Long visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test7>(): Long'
           GET_FIELD 'test7: Long' type=kotlin.Long origin=null
@@ -60,6 +67,7 @@ FILE fqName:<root> fileName:/literals.kt
       EXPRESSION_BODY
         CONST Long type=kotlin.Long value=-1
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test8> visibility:public modality:FINAL <> () returnType:Long flags:
+      correspondingProperty: PROPERTY name:test8 type:kotlin.Long visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test8>(): Long'
           GET_FIELD 'test8: Long' type=kotlin.Long origin=null
@@ -68,6 +76,7 @@ FILE fqName:<root> fileName:/literals.kt
       EXPRESSION_BODY
         CONST Double type=kotlin.Double value=1.0
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test9> visibility:public modality:FINAL <> () returnType:Double flags:
+      correspondingProperty: PROPERTY name:test9 type:kotlin.Double visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test9>(): Double'
           GET_FIELD 'test9: Double' type=kotlin.Double origin=null
@@ -76,6 +85,7 @@ FILE fqName:<root> fileName:/literals.kt
       EXPRESSION_BODY
         CONST Double type=kotlin.Double value=-1.0
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test10> visibility:public modality:FINAL <> () returnType:Double flags:
+      correspondingProperty: PROPERTY name:test10 type:kotlin.Double visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test10>(): Double'
           GET_FIELD 'test10: Double' type=kotlin.Double origin=null
@@ -84,6 +94,7 @@ FILE fqName:<root> fileName:/literals.kt
       EXPRESSION_BODY
         CONST Float type=kotlin.Float value=1.0
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test11> visibility:public modality:FINAL <> () returnType:Float flags:
+      correspondingProperty: PROPERTY name:test11 type:kotlin.Float visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test11>(): Float'
           GET_FIELD 'test11: Float' type=kotlin.Float origin=null
@@ -92,6 +103,7 @@ FILE fqName:<root> fileName:/literals.kt
       EXPRESSION_BODY
         CONST Float type=kotlin.Float value=-1.0
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test12> visibility:public modality:FINAL <> () returnType:Float flags:
+      correspondingProperty: PROPERTY name:test12 type:kotlin.Float visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test12>(): Float'
           GET_FIELD 'test12: Float' type=kotlin.Float origin=null
@@ -100,6 +112,7 @@ FILE fqName:<root> fileName:/literals.kt
       EXPRESSION_BODY
         CONST Char type=kotlin.Char value=a
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test13> visibility:public modality:FINAL <> () returnType:Char flags:
+      correspondingProperty: PROPERTY name:test13 type:kotlin.Char visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test13>(): Char'
           GET_FIELD 'test13: Char' type=kotlin.Char origin=null
@@ -108,6 +121,7 @@ FILE fqName:<root> fileName:/literals.kt
       EXPRESSION_BODY
         CONST Byte type=kotlin.Byte value=1
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testB> visibility:public modality:FINAL <> () returnType:Byte flags:
+      correspondingProperty: PROPERTY name:testB type:kotlin.Byte visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testB>(): Byte'
           GET_FIELD 'testB: Byte' type=kotlin.Byte origin=null
@@ -116,6 +130,7 @@ FILE fqName:<root> fileName:/literals.kt
       EXPRESSION_BODY
         CONST Short type=kotlin.Short value=1
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testS> visibility:public modality:FINAL <> () returnType:Short flags:
+      correspondingProperty: PROPERTY name:testS type:kotlin.Short visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testS>(): Short'
           GET_FIELD 'testS: Short' type=kotlin.Short origin=null
@@ -124,6 +139,7 @@ FILE fqName:<root> fileName:/literals.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=1
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testI> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:testI type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testI>(): Int'
           GET_FIELD 'testI: Int' type=kotlin.Int origin=null
@@ -132,6 +148,7 @@ FILE fqName:<root> fileName:/literals.kt
       EXPRESSION_BODY
         CONST Long type=kotlin.Long value=1
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testL> visibility:public modality:FINAL <> () returnType:Long flags:
+      correspondingProperty: PROPERTY name:testL type:kotlin.Long visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testL>(): Long'
           GET_FIELD 'testL: Long' type=kotlin.Long origin=null
diff --git a/compiler/testData/ir/irText/expressions/memberTypeArguments.txt b/compiler/testData/ir/irText/expressions/memberTypeArguments.txt
index c034515f791..1a598ee9b70 100644
--- a/compiler/testData/ir/irText/expressions/memberTypeArguments.txt
+++ b/compiler/testData/ir/irText/expressions/memberTypeArguments.txt
@@ -16,6 +16,7 @@ FILE fqName:<root> fileName:/memberTypeArguments.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: T' type=T origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:GenericClass<T>) returnType:T flags:
+        correspondingProperty: PROPERTY name:value type:T visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:GenericClass<T> flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): T'
diff --git a/compiler/testData/ir/irText/expressions/membersImportedFromObject.txt b/compiler/testData/ir/irText/expressions/membersImportedFromObject.txt
index 1655d508219..15e579e31b5 100644
--- a/compiler/testData/ir/irText/expressions/membersImportedFromObject.txt
+++ b/compiler/testData/ir/irText/expressions/membersImportedFromObject.txt
@@ -23,6 +23,7 @@ FILE fqName:<root> fileName:/membersImportedFromObject.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=42
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:FINAL <> ($this:A) returnType:Int flags:
+        correspondingProperty: PROPERTY name:bar type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-bar>(): Int'
@@ -30,6 +31,7 @@ FILE fqName:<root> fileName:/membersImportedFromObject.kt
               receiver: GET_VAR 'this@A: A' type=A origin=null
     PROPERTY name:barExt type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN name:<get-barExt> visibility:public modality:FINAL <> ($this:A, $receiver:kotlin.Int) returnType:Int flags:
+        correspondingProperty: PROPERTY name:barExt type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A flags:
         $receiver: VALUE_PARAMETER name:<this> type:kotlin.Int flags:
         BLOCK_BODY
@@ -54,6 +56,7 @@ FILE fqName:<root> fileName:/membersImportedFromObject.kt
         CALL 'foo(): Int' type=kotlin.Int origin=null
           $this: GET_OBJECT 'A' type=A
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): Int'
           GET_FIELD 'test1: Int' type=kotlin.Int origin=null
@@ -63,6 +66,7 @@ FILE fqName:<root> fileName:/membersImportedFromObject.kt
         CALL '<get-bar>(): Int' type=kotlin.Int origin=GET_PROPERTY
           $this: GET_OBJECT 'A' type=A
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): Int'
           GET_FIELD 'test2: Int' type=kotlin.Int origin=null
@@ -73,6 +77,7 @@ FILE fqName:<root> fileName:/membersImportedFromObject.kt
           $this: GET_OBJECT 'A' type=A
           $receiver: CONST Int type=kotlin.Int value=1
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test3 type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test3>(): Int'
           GET_FIELD 'test3: Int' type=kotlin.Int origin=null
@@ -83,6 +88,7 @@ FILE fqName:<root> fileName:/membersImportedFromObject.kt
           $this: GET_OBJECT 'A' type=A
           $receiver: CONST Int type=kotlin.Int value=1
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test4> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test4 type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test4>(): Int'
           GET_FIELD 'test4: Int' type=kotlin.Int origin=null
diff --git a/compiler/testData/ir/irText/expressions/multipleThisReferences.txt b/compiler/testData/ir/irText/expressions/multipleThisReferences.txt
index 58b5d9da507..ae69ff95963 100644
--- a/compiler/testData/ir/irText/expressions/multipleThisReferences.txt
+++ b/compiler/testData/ir/irText/expressions/multipleThisReferences.txt
@@ -22,6 +22,7 @@ FILE fqName:<root> fileName:/multipleThisReferences.kt
           EXPRESSION_BODY
             GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
         FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Outer.Inner) returnType:Int flags:
+          correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
           $this: VALUE_PARAMETER name:<this> type:Outer.Inner flags:
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -67,6 +68,7 @@ FILE fqName:<root> fileName:/multipleThisReferences.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:Host) returnType:Int flags:
+        correspondingProperty: PROPERTY name:y type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Host flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
@@ -97,6 +99,7 @@ FILE fqName:<root> fileName:/multipleThisReferences.kt
                       other: CALL '<get-y>(): Int' type=kotlin.Int origin=GET_PROPERTY
                         $this: GET_VAR 'this@Host: Host' type=Host origin=null
                 FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xx> visibility:public modality:FINAL <> ($this:Host.test.<no name provided>) returnType:Int flags:
+                  correspondingProperty: PROPERTY name:xx type:kotlin.Int visibility:public modality:FINAL flags:val
                   $this: VALUE_PARAMETER name:<this> type:Host.test.<no name provided> flags:
                   BLOCK_BODY
                     RETURN type=kotlin.Nothing from='<get-xx>(): Int'
@@ -104,6 +107,7 @@ FILE fqName:<root> fileName:/multipleThisReferences.kt
                         receiver: GET_VAR 'this@<no name provided>: <no name provided>' type=Host.test.<no name provided> origin=null
               PROPERTY FAKE_OVERRIDE name:x type:kotlin.Int visibility:public modality:FINAL flags:val
                 FUN FAKE_OVERRIDE name:<get-x> visibility:public modality:FINAL <> ($this:Outer.Inner) returnType:Int flags:
+                  correspondingProperty: PROPERTY FAKE_OVERRIDE name:x type:kotlin.Int visibility:public modality:FINAL flags:val
                   overridden:
                     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Outer.Inner) returnType:Int flags:
                   $this: VALUE_PARAMETER name:<this> type:Outer.Inner flags:
diff --git a/compiler/testData/ir/irText/expressions/objectAsCallable.txt b/compiler/testData/ir/irText/expressions/objectAsCallable.txt
index 5b27afb9a80..b22054e07a2 100644
--- a/compiler/testData/ir/irText/expressions/objectAsCallable.txt
+++ b/compiler/testData/ir/irText/expressions/objectAsCallable.txt
@@ -59,11 +59,13 @@ FILE fqName:<root> fileName:/objectAsCallable.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<En> flags:
     PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<En>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<En> flags:
     PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<En>) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<En> flags:
@@ -95,6 +97,7 @@ FILE fqName:<root> fileName:/objectAsCallable.kt
           $receiver: GET_OBJECT 'A' type=A
           i: CONST Int type=kotlin.Int value=42
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): Int'
           GET_FIELD 'test1: Int' type=kotlin.Int origin=null
@@ -105,6 +108,7 @@ FILE fqName:<root> fileName:/objectAsCallable.kt
           $receiver: GET_ENUM 'X' type=En
           i: CONST Int type=kotlin.Int value=42
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): Int'
           GET_FIELD 'test2: Int' type=kotlin.Int origin=null
diff --git a/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.txt b/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.txt
index 5d8376a3e1f..c9f982e9c20 100644
--- a/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.txt
+++ b/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.txt
@@ -4,6 +4,7 @@ FILE fqName:<root> fileName:/primitivesImplicitConversions.kt
       EXPRESSION_BODY
         CONST Long type=kotlin.Long value=42
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:Long flags:
+      correspondingProperty: PROPERTY name:test1 type:kotlin.Long visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): Long'
           GET_FIELD 'test1: Long' type=kotlin.Long origin=null
@@ -12,6 +13,7 @@ FILE fqName:<root> fileName:/primitivesImplicitConversions.kt
       EXPRESSION_BODY
         CONST Short type=kotlin.Short value=42
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:Short flags:
+      correspondingProperty: PROPERTY name:test2 type:kotlin.Short visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): Short'
           GET_FIELD 'test2: Short' type=kotlin.Short origin=null
@@ -20,6 +22,7 @@ FILE fqName:<root> fileName:/primitivesImplicitConversions.kt
       EXPRESSION_BODY
         CONST Byte type=kotlin.Byte value=42
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> () returnType:Byte flags:
+      correspondingProperty: PROPERTY name:test3 type:kotlin.Byte visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test3>(): Byte'
           GET_FIELD 'test3: Byte' type=kotlin.Byte origin=null
@@ -31,6 +34,7 @@ FILE fqName:<root> fileName:/primitivesImplicitConversions.kt
           CALL 'unaryMinus(): Int' type=kotlin.Int origin=null
             $this: CONST Int type=kotlin.Int value=42
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test4> visibility:public modality:FINAL <> () returnType:Long flags:
+      correspondingProperty: PROPERTY name:test4 type:kotlin.Long visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test4>(): Long'
           GET_FIELD 'test4: Long' type=kotlin.Long origin=null
@@ -42,6 +46,7 @@ FILE fqName:<root> fileName:/primitivesImplicitConversions.kt
           CALL 'unaryMinus(): Int' type=kotlin.Int origin=null
             $this: CONST Int type=kotlin.Int value=42
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test5> visibility:public modality:FINAL <> () returnType:Short flags:
+      correspondingProperty: PROPERTY name:test5 type:kotlin.Short visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test5>(): Short'
           GET_FIELD 'test5: Short' type=kotlin.Short origin=null
@@ -53,6 +58,7 @@ FILE fqName:<root> fileName:/primitivesImplicitConversions.kt
           CALL 'unaryMinus(): Int' type=kotlin.Int origin=null
             $this: CONST Int type=kotlin.Int value=42
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test6> visibility:public modality:FINAL <> () returnType:Byte flags:
+      correspondingProperty: PROPERTY name:test6 type:kotlin.Byte visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test6>(): Byte'
           GET_FIELD 'test6: Byte' type=kotlin.Byte origin=null
@@ -108,6 +114,7 @@ FILE fqName:<root> fileName:/primitivesImplicitConversions.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Long = ...' type=kotlin.Long origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:TestImplicitArguments) returnType:Long flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Long visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:TestImplicitArguments flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Long'
diff --git a/compiler/testData/ir/irText/expressions/references.txt b/compiler/testData/ir/irText/expressions/references.txt
index 49ff8fae661..0bf3f82c188 100644
--- a/compiler/testData/ir/irText/expressions/references.txt
+++ b/compiler/testData/ir/irText/expressions/references.txt
@@ -4,6 +4,7 @@ FILE fqName:<root> fileName:/references.kt
       EXPRESSION_BODY
         CONST String type=kotlin.String value=OK
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-ok> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:ok type:kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-ok>(): String'
           GET_FIELD 'ok: String' type=kotlin.String origin=null
@@ -12,11 +13,13 @@ FILE fqName:<root> fileName:/references.kt
       EXPRESSION_BODY
         CALL '<get-ok>(): String' type=kotlin.String origin=GET_PROPERTY
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-ok2> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:ok2 type:kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-ok2>(): String'
           GET_FIELD 'ok2: String' type=kotlin.String origin=null
   PROPERTY name:ok3 type:kotlin.String visibility:public modality:FINAL flags:val
     FUN name:<get-ok3> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:ok3 type:kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-ok3>(): String'
           CONST String type=kotlin.String value=OK
@@ -41,6 +44,7 @@ FILE fqName:<root> fileName:/references.kt
         CALL '<get-ok3>(): String' type=kotlin.String origin=GET_PROPERTY
   PROPERTY name:okext type:kotlin.String visibility:public modality:FINAL flags:val
     FUN name:<get-okext> visibility:public modality:FINAL <> ($receiver:kotlin.String) returnType:String flags:
+      correspondingProperty: PROPERTY name:okext type:kotlin.String visibility:public modality:FINAL flags:val
       $receiver: VALUE_PARAMETER name:<this> type:kotlin.String flags:
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-okext>() on String: String'
diff --git a/compiler/testData/ir/irText/expressions/reflectionLiterals.txt b/compiler/testData/ir/irText/expressions/reflectionLiterals.txt
index 92d36af8855..1826a2319dc 100644
--- a/compiler/testData/ir/irText/expressions/reflectionLiterals.txt
+++ b/compiler/testData/ir/irText/expressions/reflectionLiterals.txt
@@ -30,6 +30,7 @@ FILE fqName:<root> fileName:/reflectionLiterals.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=42
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-qux> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:qux type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-qux>(): Int'
           GET_FIELD 'qux: Int' type=kotlin.Int origin=null
@@ -38,6 +39,7 @@ FILE fqName:<root> fileName:/reflectionLiterals.kt
       EXPRESSION_BODY
         CLASS_REFERENCE 'A' type=kotlin.reflect.KClass<A>
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:KClass<A> flags:
+      correspondingProperty: PROPERTY name:test1 type:kotlin.reflect.KClass<A> visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): KClass<A>'
           GET_FIELD 'test1: KClass<A>' type=kotlin.reflect.KClass<A> origin=null
@@ -47,6 +49,7 @@ FILE fqName:<root> fileName:/reflectionLiterals.kt
         GET_CLASS type=kotlin.reflect.KClass<out kotlin.Int>
           CALL '<get-qux>(): Int' type=kotlin.Int origin=GET_PROPERTY
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:KClass<out Int> flags:
+      correspondingProperty: PROPERTY name:test2 type:kotlin.reflect.KClass<out kotlin.Int> visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): KClass<out Int>'
           GET_FIELD 'test2: KClass<out Int>' type=kotlin.reflect.KClass<out kotlin.Int> origin=null
@@ -55,6 +58,7 @@ FILE fqName:<root> fileName:/reflectionLiterals.kt
       EXPRESSION_BODY
         FUNCTION_REFERENCE 'foo(): Unit' type=kotlin.reflect.KFunction1<A, kotlin.Unit> origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> () returnType:KFunction1<A, Unit> flags:
+      correspondingProperty: PROPERTY name:test3 type:kotlin.reflect.KFunction1<A, kotlin.Unit> visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test3>(): KFunction1<A, Unit>'
           GET_FIELD 'test3: KFunction1<A, Unit>' type=kotlin.reflect.KFunction1<A, kotlin.Unit> origin=null
@@ -63,6 +67,7 @@ FILE fqName:<root> fileName:/reflectionLiterals.kt
       EXPRESSION_BODY
         FUNCTION_REFERENCE 'constructor A()' type=kotlin.reflect.KFunction0<A> origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test4> visibility:public modality:FINAL <> () returnType:KFunction0<A> flags:
+      correspondingProperty: PROPERTY name:test4 type:kotlin.reflect.KFunction0<A> visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test4>(): KFunction0<A>'
           GET_FIELD 'test4: KFunction0<A>' type=kotlin.reflect.KFunction0<A> origin=null
@@ -72,6 +77,7 @@ FILE fqName:<root> fileName:/reflectionLiterals.kt
         FUNCTION_REFERENCE 'foo(): Unit' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null
           $this: CALL 'constructor A()' type=A origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test5> visibility:public modality:FINAL <> () returnType:KFunction0<Unit> flags:
+      correspondingProperty: PROPERTY name:test5 type:kotlin.reflect.KFunction0<kotlin.Unit> visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test5>(): KFunction0<Unit>'
           GET_FIELD 'test5: KFunction0<Unit>' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null
@@ -80,6 +86,7 @@ FILE fqName:<root> fileName:/reflectionLiterals.kt
       EXPRESSION_BODY
         FUNCTION_REFERENCE 'bar(): Unit' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test6> visibility:public modality:FINAL <> () returnType:KFunction0<Unit> flags:
+      correspondingProperty: PROPERTY name:test6 type:kotlin.reflect.KFunction0<kotlin.Unit> visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test6>(): KFunction0<Unit>'
           GET_FIELD 'test6: KFunction0<Unit>' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null
@@ -88,6 +95,7 @@ FILE fqName:<root> fileName:/reflectionLiterals.kt
       EXPRESSION_BODY
         PROPERTY_REFERENCE 'qux: Int' field=null getter='<get-qux>(): Int' setter=null type=kotlin.reflect.KProperty0<kotlin.Int> origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test7> visibility:public modality:FINAL <> () returnType:KProperty0<Int> flags:
+      correspondingProperty: PROPERTY name:test7 type:kotlin.reflect.KProperty0<kotlin.Int> visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test7>(): KProperty0<Int>'
           GET_FIELD 'test7: KProperty0<Int>' type=kotlin.reflect.KProperty0<kotlin.Int> origin=null
diff --git a/compiler/testData/ir/irText/expressions/safeAssignment.txt b/compiler/testData/ir/irText/expressions/safeAssignment.txt
index ab9c2f4d06a..09bea430fb3 100644
--- a/compiler/testData/ir/irText/expressions/safeAssignment.txt
+++ b/compiler/testData/ir/irText/expressions/safeAssignment.txt
@@ -13,12 +13,14 @@ FILE fqName:<root> fileName:/safeAssignment.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@C: C' type=C origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-x> visibility:public modality:FINAL <> ($this:C, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
diff --git a/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.txt b/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.txt
index 7514eec3eec..eef91e8b379 100644
--- a/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.txt
+++ b/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.txt
@@ -22,11 +22,13 @@ FILE fqName:test fileName:/safeCallWithIncrementDecrement.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any flags:
   PROPERTY name:p type:kotlin.Int visibility:public modality:FINAL flags:var
     FUN name:<get-p> visibility:public modality:FINAL <> ($receiver:test.C?) returnType:Int flags:
+      correspondingProperty: PROPERTY name:p type:kotlin.Int visibility:public modality:FINAL flags:var
       $receiver: VALUE_PARAMETER name:<this> type:test.C? flags:
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-p>() on C?: Int'
           CONST Int type=kotlin.Int value=42
     FUN name:<set-p> visibility:public modality:FINAL <> ($receiver:test.C?, value:kotlin.Int) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:p type:kotlin.Int visibility:public modality:FINAL flags:var
       $receiver: VALUE_PARAMETER name:<this> type:test.C? flags:
       VALUE_PARAMETER name:value index:0 type:kotlin.Int flags:
       BLOCK_BODY
diff --git a/compiler/testData/ir/irText/expressions/safeCalls.txt b/compiler/testData/ir/irText/expressions/safeCalls.txt
index 5e98c5d8c86..89b4a925c2e 100644
--- a/compiler/testData/ir/irText/expressions/safeCalls.txt
+++ b/compiler/testData/ir/irText/expressions/safeCalls.txt
@@ -13,12 +13,14 @@ FILE fqName:<root> fileName:/safeCalls.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:Ref) returnType:Int flags:
+        correspondingProperty: PROPERTY name:value type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:Ref flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): Int'
             GET_FIELD 'value: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@Ref: Ref' type=Ref origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-value> visibility:public modality:FINAL <> ($this:Ref, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:value type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:Ref flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
diff --git a/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.txt b/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.txt
index 7cafbdde81d..1de4217b24d 100644
--- a/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.txt
+++ b/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.txt
@@ -16,6 +16,7 @@ FILE fqName:<root> fileName:/specializedTypeAliasConstructorCall.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: T' type=T origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:Cell<T>) returnType:T flags:
+        correspondingProperty: PROPERTY name:value type:T visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Cell<T> flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): T'
diff --git a/compiler/testData/ir/irText/expressions/stringTemplates.txt b/compiler/testData/ir/irText/expressions/stringTemplates.txt
index d07f8bc7e78..566b1eac96f 100644
--- a/compiler/testData/ir/irText/expressions/stringTemplates.txt
+++ b/compiler/testData/ir/irText/expressions/stringTemplates.txt
@@ -8,6 +8,7 @@ FILE fqName:<root> fileName:/stringTemplates.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=42
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-x>(): Int'
           GET_FIELD 'x: Int' type=kotlin.Int origin=null
@@ -16,6 +17,7 @@ FILE fqName:<root> fileName:/stringTemplates.kt
       EXPRESSION_BODY
         CONST String type=kotlin.String value=
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:test1 type:kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): String'
           GET_FIELD 'test1: String' type=kotlin.String origin=null
@@ -24,6 +26,7 @@ FILE fqName:<root> fileName:/stringTemplates.kt
       EXPRESSION_BODY
         CONST String type=kotlin.String value=abc
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:test2 type:kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): String'
           GET_FIELD 'test2: String' type=kotlin.String origin=null
@@ -32,6 +35,7 @@ FILE fqName:<root> fileName:/stringTemplates.kt
       EXPRESSION_BODY
         CONST String type=kotlin.String value=
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:test3 type:kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test3>(): String'
           GET_FIELD 'test3: String' type=kotlin.String origin=null
@@ -40,6 +44,7 @@ FILE fqName:<root> fileName:/stringTemplates.kt
       EXPRESSION_BODY
         CONST String type=kotlin.String value=abc
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test4> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:test4 type:kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test4>(): String'
           GET_FIELD 'test4: String' type=kotlin.String origin=null
@@ -53,6 +58,7 @@ FILE fqName:<root> fileName:/stringTemplates.kt
           CONST String type=kotlin.String value=
 
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test5> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:test5 type:kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test5>(): String'
           GET_FIELD 'test5: String' type=kotlin.String origin=null
@@ -64,6 +70,7 @@ FILE fqName:<root> fileName:/stringTemplates.kt
           CONST String type=kotlin.String value= 
           CALL 'foo(): String' type=kotlin.String origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test6> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:test6 type:kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test6>(): String'
           GET_FIELD 'test6: String' type=kotlin.String origin=null
@@ -73,6 +80,7 @@ FILE fqName:<root> fileName:/stringTemplates.kt
         STRING_CONCATENATION type=kotlin.String
           CALL '<get-test1>(): String' type=kotlin.String origin=GET_PROPERTY
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test7> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:test7 type:kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test7>(): String'
           GET_FIELD 'test7: String' type=kotlin.String origin=null
@@ -82,6 +90,7 @@ FILE fqName:<root> fileName:/stringTemplates.kt
         STRING_CONCATENATION type=kotlin.String
           CALL 'foo(): String' type=kotlin.String origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test8> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:test8 type:kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test8>(): String'
           GET_FIELD 'test8: String' type=kotlin.String origin=null
@@ -91,6 +100,7 @@ FILE fqName:<root> fileName:/stringTemplates.kt
         STRING_CONCATENATION type=kotlin.String
           CALL '<get-x>(): Int' type=kotlin.Int origin=GET_PROPERTY
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test9> visibility:public modality:FINAL <> () returnType:String flags:
+      correspondingProperty: PROPERTY name:test9 type:kotlin.String visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test9>(): String'
           GET_FIELD 'test9: String' type=kotlin.String origin=null
diff --git a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.txt b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.txt
index 25ea65c76c3..461f4c40e33 100644
--- a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.txt
+++ b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.txt
@@ -16,6 +16,7 @@ FILE fqName:<root> fileName:/thisOfGenericOuterClass.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: T' type=T origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Outer<T>) returnType:T flags:
+        correspondingProperty: PROPERTY name:x type:T visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Outer<T> flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): T'
@@ -36,6 +37,7 @@ FILE fqName:<root> fileName:/thisOfGenericOuterClass.kt
           EXPRESSION_BODY
             GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
         FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:Outer<T>.Inner) returnType:Int flags:
+          correspondingProperty: PROPERTY name:y type:kotlin.Int visibility:public modality:FINAL flags:val
           $this: VALUE_PARAMETER name:<this> type:Outer<T>.Inner flags:
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-y>(): Int'
@@ -91,6 +93,7 @@ FILE fqName:<root> fileName:/thisOfGenericOuterClass.kt
                     other: CALL '<get-y>(): Int' type=kotlin.Int origin=GET_PROPERTY
                       $this: GET_VAR 'this@<no name provided>: <no name provided>' type=test.<no name provided> origin=null
               FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xx> visibility:public modality:FINAL <> ($this:test.<no name provided>) returnType:Int flags:
+                correspondingProperty: PROPERTY name:xx type:kotlin.Int visibility:public modality:FINAL flags:val
                 $this: VALUE_PARAMETER name:<this> type:test.<no name provided> flags:
                 BLOCK_BODY
                   RETURN type=kotlin.Nothing from='<get-xx>(): Int'
@@ -98,6 +101,7 @@ FILE fqName:<root> fileName:/thisOfGenericOuterClass.kt
                       receiver: GET_VAR 'this@<no name provided>: <no name provided>' type=test.<no name provided> origin=null
             PROPERTY FAKE_OVERRIDE name:y type:kotlin.Int visibility:public modality:FINAL flags:val
               FUN FAKE_OVERRIDE name:<get-y> visibility:public modality:FINAL <> ($this:Outer<kotlin.Int>.Inner) returnType:Int flags:
+                correspondingProperty: PROPERTY FAKE_OVERRIDE name:y type:kotlin.Int visibility:public modality:FINAL flags:val
                 overridden:
                   FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:Outer<T>.Inner) returnType:Int flags:
                 $this: VALUE_PARAMETER name:<this> type:Outer<kotlin.Int>.Inner flags:
diff --git a/compiler/testData/ir/irText/expressions/typeParameterClassLiteral.txt b/compiler/testData/ir/irText/expressions/typeParameterClassLiteral.txt
index c1617576633..89550cdc448 100644
--- a/compiler/testData/ir/irText/expressions/typeParameterClassLiteral.txt
+++ b/compiler/testData/ir/irText/expressions/typeParameterClassLiteral.txt
@@ -16,6 +16,7 @@ FILE fqName:<root> fileName:/typeParameterClassLiteral.kt
         CLASS_REFERENCE '<reified T : Any>' type=kotlin.reflect.KClass<T>
   PROPERTY name:classRefExtVal type:kotlin.reflect.KClass<T> visibility:public modality:FINAL flags:val
     FUN name:<get-classRefExtVal> visibility:public modality:FINAL <T> ($receiver:T) returnType:KClass<T> flags:inline
+      correspondingProperty: PROPERTY name:classRefExtVal type:kotlin.reflect.KClass<T> visibility:public modality:FINAL flags:val
       TYPE_PARAMETER name:T index:0 variance: upperBounds:[kotlin.Any]
         superClassifiers:
           CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
@@ -50,6 +51,7 @@ FILE fqName:<root> fileName:/typeParameterClassLiteral.kt
           CLASS_REFERENCE '<reified TF : Any>' type=kotlin.reflect.KClass<TF>
     PROPERTY name:classRefGenericMemberExtVal type:kotlin.reflect.KClass<TV> visibility:public modality:FINAL flags:val
       FUN name:<get-classRefGenericMemberExtVal> visibility:public modality:FINAL <TV> ($this:Host, $receiver:TV) returnType:KClass<TV> flags:inline
+        correspondingProperty: PROPERTY name:classRefGenericMemberExtVal type:kotlin.reflect.KClass<TV> visibility:public modality:FINAL flags:val
         TYPE_PARAMETER name:TV index:0 variance: upperBounds:[kotlin.Any]
           superClassifiers:
             CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
diff --git a/compiler/testData/ir/irText/expressions/useImportedMember.txt b/compiler/testData/ir/irText/expressions/useImportedMember.txt
index ffbf1b4b9fb..5b2d140dec8 100644
--- a/compiler/testData/ir/irText/expressions/useImportedMember.txt
+++ b/compiler/testData/ir/irText/expressions/useImportedMember.txt
@@ -44,6 +44,7 @@ FILE fqName:<root> fileName:/useImportedMember.kt
         INSTANCE_INITIALIZER_CALL classDescriptor='BaseClass'
     PROPERTY name:fromClass type:T visibility:public modality:FINAL flags:val
       FUN name:<get-fromClass> visibility:public modality:FINAL <T> ($this:BaseClass, $receiver:T) returnType:T flags:
+        correspondingProperty: PROPERTY name:fromClass type:T visibility:public modality:FINAL flags:val
         TYPE_PARAMETER name:T index:0 variance: upperBounds:[kotlin.Any?]
           superClassifiers:
             CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
@@ -97,12 +98,14 @@ FILE fqName:<root> fileName:/useImportedMember.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=4
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-p> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+        correspondingProperty: PROPERTY name:p type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-p>(): Int'
             GET_FIELD 'p: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@C: C' type=C origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<set-p> visibility:public modality:FINAL <> ($this:C, <set-?>:kotlin.Int) returnType:Unit flags:
+        correspondingProperty: PROPERTY name:p type:kotlin.Int visibility:public modality:FINAL flags:var
         $this: VALUE_PARAMETER name:<this> type:C flags:
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
@@ -111,6 +114,7 @@ FILE fqName:<root> fileName:/useImportedMember.kt
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     PROPERTY name:ext type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN name:<get-ext> visibility:public modality:FINAL <> ($this:C, $receiver:kotlin.Int) returnType:Int flags:
+        correspondingProperty: PROPERTY name:ext type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:C flags:
         $receiver: VALUE_PARAMETER name:<this> type:kotlin.Int flags:
         BLOCK_BODY
@@ -127,6 +131,7 @@ FILE fqName:<root> fileName:/useImportedMember.kt
           GET_VAR 'value-parameter t: T' type=T origin=null
     PROPERTY name:g2 type:T visibility:public modality:FINAL flags:val
       FUN name:<get-g2> visibility:public modality:FINAL <T> ($this:C, $receiver:T) returnType:T flags:
+        correspondingProperty: PROPERTY name:g2 type:T visibility:public modality:FINAL flags:val
         TYPE_PARAMETER name:T index:0 variance: upperBounds:[kotlin.Any?]
           superClassifiers:
             CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
@@ -137,6 +142,7 @@ FILE fqName:<root> fileName:/useImportedMember.kt
             GET_VAR 'this@g2: T' type=T origin=null
     PROPERTY FAKE_OVERRIDE name:fromClass type:T visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-fromClass> visibility:public modality:FINAL <> ($this:BaseClass, $receiver:T) returnType:T flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:fromClass type:T visibility:public modality:FINAL flags:val
         overridden:
           FUN name:<get-fromClass> visibility:public modality:FINAL <T> ($this:BaseClass, $receiver:T) returnType:T flags:
         $this: VALUE_PARAMETER name:<this> type:BaseClass flags:
diff --git a/compiler/testData/ir/irText/expressions/values.txt b/compiler/testData/ir/irText/expressions/values.txt
index 2a01fc10fbe..999f08bdc7f 100644
--- a/compiler/testData/ir/irText/expressions/values.txt
+++ b/compiler/testData/ir/irText/expressions/values.txt
@@ -38,11 +38,13 @@ FILE fqName:<root> fileName:/values.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Enum> flags:
     PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<Enum>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Enum> flags:
     PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<Enum>) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Enum> flags:
@@ -81,6 +83,7 @@ FILE fqName:<root> fileName:/values.kt
       EXPRESSION_BODY
         CONST Int type=kotlin.Int value=0
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-a> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:a type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-a>(): Int'
           GET_FIELD 'a: Int' type=kotlin.Int origin=null
diff --git a/compiler/testData/ir/irText/expressions/vararg.txt b/compiler/testData/ir/irText/expressions/vararg.txt
index 472c1f5ad90..c6aa3a8e11a 100644
--- a/compiler/testData/ir/irText/expressions/vararg.txt
+++ b/compiler/testData/ir/irText/expressions/vararg.txt
@@ -5,6 +5,7 @@ FILE fqName:<root> fileName:/vararg.kt
         CALL 'arrayOf(vararg String): Array<String>' type=kotlin.Array<kotlin.String> origin=null
           <reified T>: String
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:Array<String> flags:
+      correspondingProperty: PROPERTY name:test1 type:kotlin.Array<kotlin.String> visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): Array<String>'
           GET_FIELD 'test1: Array<String>' type=kotlin.Array<kotlin.String> origin=null
@@ -18,6 +19,7 @@ FILE fqName:<root> fileName:/vararg.kt
             CONST String type=kotlin.String value=2
             CONST String type=kotlin.String value=3
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:Array<String> flags:
+      correspondingProperty: PROPERTY name:test2 type:kotlin.Array<kotlin.String> visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): Array<String>'
           GET_FIELD 'test2: Array<String>' type=kotlin.Array<kotlin.String> origin=null
@@ -34,6 +36,7 @@ FILE fqName:<root> fileName:/vararg.kt
               CALL '<get-test1>(): Array<String>' type=kotlin.Array<kotlin.String> origin=GET_PROPERTY
             CONST String type=kotlin.String value=4
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> () returnType:Array<String> flags:
+      correspondingProperty: PROPERTY name:test3 type:kotlin.Array<kotlin.String> visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test3>(): Array<String>'
           GET_FIELD 'test3: Array<String>' type=kotlin.Array<kotlin.String> origin=null
diff --git a/compiler/testData/ir/irText/lambdas/anonymousFunction.txt b/compiler/testData/ir/irText/lambdas/anonymousFunction.txt
index c11c1403b96..64944bc8ee9 100644
--- a/compiler/testData/ir/irText/lambdas/anonymousFunction.txt
+++ b/compiler/testData/ir/irText/lambdas/anonymousFunction.txt
@@ -8,6 +8,7 @@ FILE fqName:<root> fileName:/anonymousFunction.kt
               CALL 'println(): Unit' type=kotlin.Unit origin=null
           FUNCTION_REFERENCE '<no name provided>(): Unit' type=() -> kotlin.Unit origin=ANONYMOUS_FUNCTION
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-anonymous> visibility:public modality:FINAL <> () returnType:Function0<Unit> flags:
+      correspondingProperty: PROPERTY name:anonymous type:() -> kotlin.Unit visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-anonymous>(): () -> Unit'
           GET_FIELD 'anonymous: () -> Unit' type=() -> kotlin.Unit origin=null
diff --git a/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt b/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt
index 226d01595ba..f567c08d426 100644
--- a/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt
+++ b/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt
@@ -14,6 +14,7 @@ FILE fqName:<root> fileName:/destructuringInLambda.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:A) returnType:Int flags:
+        correspondingProperty: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
@@ -24,6 +25,7 @@ FILE fqName:<root> fileName:/destructuringInLambda.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:A) returnType:Int flags:
+        correspondingProperty: PROPERTY name:y type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
@@ -155,10 +157,12 @@ FILE fqName:<root> fileName:/destructuringInLambda.kt
                   other: GET_VAR 'y: Int' type=kotlin.Int origin=null
           FUNCTION_REFERENCE '<anonymous>(A): Int' type=(A) -> kotlin.Int origin=LAMBDA
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-fn> visibility:public modality:FINAL <> () returnType:Function1<A, Int> flags:
+      correspondingProperty: PROPERTY name:fn type:(A) -> kotlin.Int visibility:public modality:FINAL flags:var
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-fn>(): (A) -> Int'
           GET_FIELD 'fn: (A) -> Int' type=(A) -> kotlin.Int origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<set-fn> visibility:public modality:FINAL <> (<set-?>:(A) -> kotlin.Int) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:fn type:(A) -> kotlin.Int visibility:public modality:FINAL flags:var
       VALUE_PARAMETER name:<set-?> index:0 type:(A) -> kotlin.Int flags:
       BLOCK_BODY
         SET_FIELD 'fn: (A) -> Int' type=kotlin.Unit origin=null
diff --git a/compiler/testData/ir/irText/lambdas/justLambda.txt b/compiler/testData/ir/irText/lambdas/justLambda.txt
index 2483ca1244a..7de532ea9ec 100644
--- a/compiler/testData/ir/irText/lambdas/justLambda.txt
+++ b/compiler/testData/ir/irText/lambdas/justLambda.txt
@@ -9,6 +9,7 @@ FILE fqName:<root> fileName:/justLambda.kt
                 CONST Int type=kotlin.Int value=42
           FUNCTION_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int origin=LAMBDA
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:Function0<Int> flags:
+      correspondingProperty: PROPERTY name:test1 type:() -> kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): () -> Int'
           GET_FIELD 'test1: () -> Int' type=() -> kotlin.Int origin=null
@@ -22,6 +23,7 @@ FILE fqName:<root> fileName:/justLambda.kt
                 GET_OBJECT 'Unit' type=kotlin.Unit
           FUNCTION_REFERENCE '<anonymous>(): Unit' type=() -> kotlin.Unit origin=LAMBDA
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:Function0<Unit> flags:
+      correspondingProperty: PROPERTY name:test2 type:() -> kotlin.Unit visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): () -> Unit'
           GET_FIELD 'test2: () -> Unit' type=() -> kotlin.Unit origin=null
diff --git a/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.txt b/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.txt
index b8fb7332e70..11a451fa79b 100644
--- a/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.txt
+++ b/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.txt
@@ -47,6 +47,7 @@ FILE fqName:<root> fileName:/multipleImplicitReceivers.kt
       CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
     PROPERTY name:foo type:B visibility:public modality:OPEN flags:val
       FUN name:<get-foo> visibility:public modality:OPEN <> ($this:IFoo, $receiver:A) returnType:B flags:
+        correspondingProperty: PROPERTY name:foo type:B visibility:public modality:OPEN flags:val
         $this: VALUE_PARAMETER name:<this> type:IFoo flags:
         $receiver: VALUE_PARAMETER name:<this> type:A flags:
         BLOCK_BODY
diff --git a/compiler/testData/ir/irText/regressions/integerCoercionToT.txt b/compiler/testData/ir/irText/regressions/integerCoercionToT.txt
index ff6842e890e..deb1ceab20a 100644
--- a/compiler/testData/ir/irText/regressions/integerCoercionToT.txt
+++ b/compiler/testData/ir/irText/regressions/integerCoercionToT.txt
@@ -51,6 +51,7 @@ FILE fqName:<root> fileName:/integerCoercionToT.kt
   TYPEALIAS typealias CInt32Var = CInt32VarX<Int> type=CInt32VarX<kotlin.Int>
   PROPERTY name:value type:T_INT visibility:public modality:FINAL flags:var
     FUN name:<get-value> visibility:public modality:FINAL <T_INT> ($receiver:CInt32VarX<T_INT>) returnType:T_INT flags:
+      correspondingProperty: PROPERTY name:value type:T_INT visibility:public modality:FINAL flags:var
       TYPE_PARAMETER name:T_INT index:0 variance: upperBounds:[kotlin.Int]
         superClassifiers:
           CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Int modality:FINAL visibility:public flags:
@@ -59,6 +60,7 @@ FILE fqName:<root> fileName:/integerCoercionToT.kt
         RETURN type=kotlin.Nothing from='<get-value>() on CInt32VarX<T_INT>: T_INT'
           CALL 'TODO(): Nothing' type=kotlin.Nothing origin=null
     FUN name:<set-value> visibility:public modality:FINAL <T_INT> ($receiver:CInt32VarX<T_INT>, value:T_INT) returnType:Unit flags:
+      correspondingProperty: PROPERTY name:value type:T_INT visibility:public modality:FINAL flags:var
       TYPE_PARAMETER name:T_INT index:0 variance: upperBounds:[kotlin.Int]
         superClassifiers:
           CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Int modality:FINAL visibility:public flags:
@@ -79,6 +81,7 @@ FILE fqName:<root> fileName:/integerCoercionToT.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:IdType) returnType:Int flags:
+        correspondingProperty: PROPERTY name:value type:kotlin.Int visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:IdType flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): Int'
diff --git a/compiler/testData/ir/irText/regressions/kt24114.txt b/compiler/testData/ir/irText/regressions/kt24114.txt
index 4ec01e3fb61..47aabf379f8 100644
--- a/compiler/testData/ir/irText/regressions/kt24114.txt
+++ b/compiler/testData/ir/irText/regressions/kt24114.txt
@@ -66,3 +66,4 @@ FILE fqName:<root> fileName:/kt24114.kt
                 if: CONST Boolean type=kotlin.Boolean value=true
                 then: RETURN type=kotlin.Nothing from='test2(): Int'
                   CONST Int type=kotlin.Int value=3
+
diff --git a/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.txt b/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.txt
index 12aef7bd19e..2a97748a101 100644
--- a/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.txt
+++ b/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.txt
@@ -16,6 +16,7 @@ FILE fqName:<root> fileName:/typeAliasCtorForGenericClass.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter q: Q' type=Q origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-q> visibility:public modality:FINAL <> ($this:A<Q>) returnType:Q flags:
+        correspondingProperty: PROPERTY name:q type:Q visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:A<Q> flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-q>(): Q'
diff --git a/compiler/testData/ir/irText/singletons/enumEntry.txt b/compiler/testData/ir/irText/singletons/enumEntry.txt
index 49ba8515375..baa6562fef3 100644
--- a/compiler/testData/ir/irText/singletons/enumEntry.txt
+++ b/compiler/testData/ir/irText/singletons/enumEntry.txt
@@ -75,11 +75,13 @@ FILE fqName:<root> fileName:/enumEntry.kt
           $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Z> flags:
         PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<Z>) returnType:String flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<Z>) returnType:String flags:
             $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Z> flags:
         PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<Z>) returnType:Int flags:
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<Z>) returnType:Int flags:
             $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Z> flags:
@@ -115,11 +117,13 @@ FILE fqName:<root> fileName:/enumEntry.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Z> flags:
     PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<Z>) returnType:String flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name type:kotlin.String visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:String flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Z> flags:
     PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
       FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<Z>) returnType:Int flags:
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
         overridden:
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<E>) returnType:Int flags:
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<Z> flags:
diff --git a/compiler/testData/ir/irText/stubs/builtinMap__builtinsmodule.txt b/compiler/testData/ir/irText/stubs/builtinMap__builtinsmodule.txt
index 4320fb6d65a..2dbcec766d5 100644
--- a/compiler/testData/ir/irText/stubs/builtinMap__builtinsmodule.txt
+++ b/compiler/testData/ir/irText/stubs/builtinMap__builtinsmodule.txt
@@ -78,21 +78,25 @@ MODULE_FRAGMENT name:<built-ins module>
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.Map<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:ABSTRACT flags:val
         FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map<K, V>) returnType:Int flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:ABSTRACT flags:val
           overridden:
             UNBOUND: fun <get-size>(): kotlin.Int
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.Map<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:entries type:kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K, V>> visibility:public modality:ABSTRACT flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-entries> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap<K, V>) returnType:MutableSet<MutableEntry<K, V>> flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:entries type:kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K, V>> visibility:public modality:ABSTRACT flags:val
           overridden:
             UNBOUND: fun <get-entries>(): kotlin.collections.Set<kotlin.collections.Map.Entry<K, V>>
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.MutableMap<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:keys type:kotlin.collections.MutableSet<K> visibility:public modality:ABSTRACT flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-keys> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap<K, V>) returnType:MutableSet<K> flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:keys type:kotlin.collections.MutableSet<K> visibility:public modality:ABSTRACT flags:val
           overridden:
             UNBOUND: fun <get-keys>(): kotlin.collections.Set<K>
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.MutableMap<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.MutableCollection<V> visibility:public modality:ABSTRACT flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-values> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap<K, V>) returnType:MutableCollection<V> flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.MutableCollection<V> visibility:public modality:ABSTRACT flags:val
           overridden:
             UNBOUND: fun <get-values>(): kotlin.collections.Collection<V>
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.MutableMap<K, V> flags:
@@ -107,11 +111,13 @@ MODULE_FRAGMENT name:<built-ins module>
           VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:newValue index:0 type:V flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K visibility:public modality:ABSTRACT flags:val
           FUN FAKE_OVERRIDE name:<get-key> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.Entry<K, V>) returnType:K flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K visibility:public modality:ABSTRACT flags:val
             overridden:
               UNBOUND: fun <get-key>(): K
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.Map.Entry<K, V> flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V visibility:public modality:ABSTRACT flags:val
           FUN FAKE_OVERRIDE name:<get-value> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.Entry<K, V>) returnType:V flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V visibility:public modality:ABSTRACT flags:val
             overridden:
               UNBOUND: fun <get-value>(): V
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.Map.Entry<K, V> flags:
diff --git a/compiler/testData/ir/irText/stubs/builtinMap__dependenciesoftestmodule.txt b/compiler/testData/ir/irText/stubs/builtinMap__dependenciesoftestmodule.txt
index 7a975bb1a21..c5986a6e57a 100644
--- a/compiler/testData/ir/irText/stubs/builtinMap__dependenciesoftestmodule.txt
+++ b/compiler/testData/ir/irText/stubs/builtinMap__dependenciesoftestmodule.txt
@@ -149,6 +149,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractMap<K!, V!> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:OPEN flags:val
         FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:OPEN <> ($this:java.util.HashMap<K!, V!>) returnType:Int flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:OPEN flags:val
           overridden:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-size> visibility:public modality:OPEN <> ($this:java.util.HashMap<K, V>) returnType:Int flags:
             FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map<K, V>) returnType:Int flags:
@@ -191,18 +192,21 @@ MODULE_FRAGMENT name:<dependencies of test-module>
         VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p0 index:0 type:java.util.function.BiFunction<in K, in V, out V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:entries type:kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K, V>> visibility:public modality:OPEN flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-entries> visibility:public modality:OPEN <> ($this:java.util.LinkedHashMap<K, V>) returnType:(kotlin.collections.MutableSet<(kotlin.collections.MutableMap.MutableEntry<(K..K?), (V..V?)>..kotlin.collections.Map.Entry<(K..K?), (V..V?)>?)>..kotlin.collections.Set<(kotlin.collections.MutableMap.MutableEntry<(K..K?), (V..V?)>..kotlin.collections.Map.Entry<(K..K?), (V..V?)>?)>?) flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:entries type:kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K, V>> visibility:public modality:OPEN flags:val
           overridden:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-entries> visibility:public modality:OPEN <> ($this:java.util.HashMap<K, V>) returnType:(kotlin.collections.MutableSet<(kotlin.collections.MutableMap.MutableEntry<(K..K?), (V..V?)>..kotlin.collections.Map.Entry<(K..K?), (V..V?)>?)>..kotlin.collections.Set<(kotlin.collections.MutableMap.MutableEntry<(K..K?), (V..V?)>..kotlin.collections.Map.Entry<(K..K?), (V..V?)>?)>?) flags:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-entries> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap<K, V>) returnType:MutableSet<MutableEntry<K, V>> flags:
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.LinkedHashMap<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:keys type:kotlin.collections.MutableSet<K> visibility:public modality:OPEN flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-keys> visibility:public modality:OPEN <> ($this:java.util.LinkedHashMap<K, V>) returnType:(kotlin.collections.MutableSet<(K..K?)>..kotlin.collections.Set<(K..K?)>?) flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:keys type:kotlin.collections.MutableSet<K> visibility:public modality:OPEN flags:val
           overridden:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-keys> visibility:public modality:OPEN <> ($this:java.util.HashMap<K, V>) returnType:(kotlin.collections.MutableSet<(K..K?)>..kotlin.collections.Set<(K..K?)>?) flags:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-keys> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap<K, V>) returnType:MutableSet<K> flags:
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.LinkedHashMap<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.MutableCollection<V> visibility:public modality:OPEN flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-values> visibility:public modality:OPEN <> ($this:java.util.LinkedHashMap<K, V>) returnType:(kotlin.collections.MutableCollection<(V..V?)>..kotlin.collections.Collection<(V..V?)>?) flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.MutableCollection<V> visibility:public modality:OPEN flags:val
           overridden:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-values> visibility:public modality:OPEN <> ($this:java.util.HashMap<K, V>) returnType:(kotlin.collections.MutableCollection<(V..V?)>..kotlin.collections.Collection<(V..V?)>?) flags:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-values> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap<K, V>) returnType:MutableCollection<V> flags:
@@ -325,6 +329,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.LinkedHashMap<K, V>.LinkedEntrySet flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:FINAL flags:val
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-size> visibility:public modality:FINAL <> ($this:java.util.LinkedHashMap<K, V>.LinkedEntrySet) returnType:Int flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:FINAL flags:val
             overridden:
               UNBOUND: fun <get-size>(): kotlin.Int
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.LinkedHashMap<K, V>.LinkedEntrySet flags:
@@ -492,6 +497,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.LinkedHashMap<K, V>.LinkedKeySet flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:FINAL flags:val
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-size> visibility:public modality:FINAL <> ($this:java.util.LinkedHashMap<K, V>.LinkedKeySet) returnType:Int flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:FINAL flags:val
             overridden:
               UNBOUND: fun <get-size>(): kotlin.Int
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.LinkedHashMap<K, V>.LinkedKeySet flags:
@@ -654,6 +660,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.LinkedHashMap<K, V>.LinkedValues flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:FINAL flags:val
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-size> visibility:public modality:FINAL <> ($this:java.util.LinkedHashMap<K, V>.LinkedValues) returnType:Int flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:FINAL flags:val
             overridden:
               UNBOUND: fun <get-size>(): kotlin.Int
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.LinkedHashMap<K, V>.LinkedValues flags:
@@ -840,11 +847,13 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap.Node<K!, V!> flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K! visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-key> visibility:public modality:FINAL <> ($this:java.util.HashMap.Node<K!, V!>) returnType:(K..K?) flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K! visibility:public modality:FINAL flags:val
             overridden:
               FUN IR_EXTERNAL_DECLARATION_STUB name:<get-key> visibility:public modality:FINAL <> ($this:java.util.HashMap.Node<K, V>) returnType:(K..K?) flags:
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap.Node<K!, V!> flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-value> visibility:public modality:FINAL <> ($this:java.util.HashMap.Node<K!, V!>) returnType:(V..V?) flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:public modality:FINAL flags:val
             overridden:
               FUN IR_EXTERNAL_DECLARATION_STUB name:<get-value> visibility:public modality:FINAL <> ($this:java.util.HashMap.Node<K, V>) returnType:(V..V?) flags:
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap.Node<K!, V!> flags:
@@ -1103,24 +1112,28 @@ MODULE_FRAGMENT name:<dependencies of test-module>
         VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p0 index:0 type:java.util.function.BiFunction<in K, in V, out V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:entries type:kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K, V>> visibility:public modality:OPEN flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-entries> visibility:public modality:OPEN <> ($this:java.util.HashMap<K, V>) returnType:(kotlin.collections.MutableSet<(kotlin.collections.MutableMap.MutableEntry<(K..K?), (V..V?)>..kotlin.collections.Map.Entry<(K..K?), (V..V?)>?)>..kotlin.collections.Set<(kotlin.collections.MutableMap.MutableEntry<(K..K?), (V..V?)>..kotlin.collections.Map.Entry<(K..K?), (V..V?)>?)>?) flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:entries type:kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K, V>> visibility:public modality:OPEN flags:val
           overridden:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-entries> visibility:public modality:ABSTRACT <> ($this:java.util.AbstractMap<K, V>) returnType:(kotlin.collections.MutableSet<(kotlin.collections.MutableMap.MutableEntry<(K..K?), (V..V?)>..kotlin.collections.Map.Entry<(K..K?), (V..V?)>?)>..kotlin.collections.Set<(kotlin.collections.MutableMap.MutableEntry<(K..K?), (V..V?)>..kotlin.collections.Map.Entry<(K..K?), (V..V?)>?)>?) flags:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-entries> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap<K, V>) returnType:MutableSet<MutableEntry<K, V>> flags:
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:keys type:kotlin.collections.MutableSet<K> visibility:public modality:OPEN flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-keys> visibility:public modality:OPEN <> ($this:java.util.HashMap<K, V>) returnType:(kotlin.collections.MutableSet<(K..K?)>..kotlin.collections.Set<(K..K?)>?) flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:keys type:kotlin.collections.MutableSet<K> visibility:public modality:OPEN flags:val
           overridden:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-keys> visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K, V>) returnType:(kotlin.collections.MutableSet<(K..K?)>..kotlin.collections.Set<(K..K?)>?) flags:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-keys> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap<K, V>) returnType:MutableSet<K> flags:
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:OPEN flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-size> visibility:public modality:OPEN <> ($this:java.util.HashMap<K, V>) returnType:Int flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:OPEN flags:val
           overridden:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-size> visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K, V>) returnType:Int flags:
             FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map<K, V>) returnType:Int flags:
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.MutableCollection<V> visibility:public modality:OPEN flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-values> visibility:public modality:OPEN <> ($this:java.util.HashMap<K, V>) returnType:(kotlin.collections.MutableCollection<(V..V?)>..kotlin.collections.Collection<(V..V?)>?) flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.MutableCollection<V> visibility:public modality:OPEN flags:val
           overridden:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-values> visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K, V>) returnType:(kotlin.collections.MutableCollection<(V..V?)>..kotlin.collections.Collection<(V..V?)>?) flags:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-values> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap<K, V>) returnType:MutableCollection<V> flags:
@@ -1405,11 +1418,13 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap.Node<K!, V!> flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K! visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-key> visibility:public modality:FINAL <> ($this:java.util.HashMap.Node<K!, V!>) returnType:(K..K?) flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K! visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-key> visibility:public modality:FINAL <> ($this:java.util.HashMap.Node<K!, V!>) returnType:(K..K?) flags:
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap.Node<K!, V!> flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:public modality:FINAL flags:val
           FUN FAKE_OVERRIDE name:<get-value> visibility:public modality:FINAL <> ($this:java.util.HashMap.Node<K!, V!>) returnType:(V..V?) flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-value> visibility:public modality:FINAL <> ($this:java.util.HashMap.Node<K!, V!>) returnType:(V..V?) flags:
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap.Node<K!, V!> flags:
@@ -1720,6 +1735,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V>.EntrySet flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:FINAL flags:val
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-size> visibility:public modality:FINAL <> ($this:java.util.HashMap<K, V>.EntrySet) returnType:Int flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:FINAL flags:val
             overridden:
               UNBOUND: fun <get-size>(): kotlin.Int
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V>.EntrySet flags:
@@ -1889,6 +1905,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V>.KeySet flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:FINAL flags:val
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-size> visibility:public modality:FINAL <> ($this:java.util.HashMap<K, V>.KeySet) returnType:Int flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:FINAL flags:val
             overridden:
               UNBOUND: fun <get-size>(): kotlin.Int
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V>.KeySet flags:
@@ -2053,6 +2070,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V>.Values flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:FINAL flags:val
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-size> visibility:public modality:FINAL <> ($this:java.util.HashMap<K, V>.Values) returnType:Int flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:FINAL flags:val
             overridden:
               UNBOUND: fun <get-size>(): kotlin.Int
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap<K, V>.Values flags:
@@ -2226,11 +2244,13 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap.Node<K, V> flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K! visibility:public modality:FINAL flags:val
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-key> visibility:public modality:FINAL <> ($this:java.util.HashMap.Node<K, V>) returnType:(K..K?) flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K! visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-key> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.Entry<K, V>) returnType:K flags:
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap.Node<K, V> flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:public modality:FINAL flags:val
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-value> visibility:public modality:FINAL <> ($this:java.util.HashMap.Node<K, V>) returnType:(V..V?) flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:public modality:FINAL flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-value> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.Entry<K, V>) returnType:V flags:
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.HashMap.Node<K, V> flags:
@@ -2328,6 +2348,7 @@ MODULE_FRAGMENT name:<dependencies of test-module>
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractMap<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:entries type:kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K!, V!>> visibility:public modality:ABSTRACT flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-entries> visibility:public modality:ABSTRACT <> ($this:java.util.AbstractMap<K, V>) returnType:(kotlin.collections.MutableSet<(kotlin.collections.MutableMap.MutableEntry<(K..K?), (V..V?)>..kotlin.collections.Map.Entry<(K..K?), (V..V?)>?)>..kotlin.collections.Set<(kotlin.collections.MutableMap.MutableEntry<(K..K?), (V..V?)>..kotlin.collections.Map.Entry<(K..K?), (V..V?)>?)>?) flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:entries type:kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K!, V!>> visibility:public modality:ABSTRACT flags:val
           overridden:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-entries> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap<K, V>) returnType:MutableSet<MutableEntry<K, V>> flags:
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractMap<K, V> flags:
@@ -2354,11 +2375,13 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:newValue index:0 type:V! flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K! visibility:public modality:OPEN flags:val
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-key> visibility:public modality:OPEN <> ($this:java.util.AbstractMap.SimpleEntry<K, V>) returnType:(K..K?) flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K! visibility:public modality:OPEN flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-key> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.Entry<K, V>) returnType:K flags:
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractMap.SimpleEntry<K, V> flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:public modality:OPEN flags:val
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-value> visibility:public modality:OPEN <> ($this:java.util.AbstractMap.SimpleEntry<K, V>) returnType:(V..V?) flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:public modality:OPEN flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-value> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.Entry<K, V>) returnType:V flags:
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractMap.SimpleEntry<K, V> flags:
@@ -2403,11 +2426,13 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:newValue index:0 type:V! flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K! visibility:public modality:OPEN flags:val
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-key> visibility:public modality:OPEN <> ($this:java.util.AbstractMap.SimpleImmutableEntry<K, V>) returnType:(K..K?) flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K! visibility:public modality:OPEN flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-key> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.Entry<K, V>) returnType:K flags:
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractMap.SimpleImmutableEntry<K, V> flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:public modality:OPEN flags:val
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-value> visibility:public modality:OPEN <> ($this:java.util.AbstractMap.SimpleImmutableEntry<K, V>) returnType:(V..V?) flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:public modality:OPEN flags:val
             overridden:
               FUN FAKE_OVERRIDE name:<get-value> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.Entry<K, V>) returnType:V flags:
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractMap.SimpleImmutableEntry<K, V> flags:
@@ -2537,16 +2562,19 @@ MODULE_FRAGMENT name:<dependencies of test-module>
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractMap<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:keys type:kotlin.collections.MutableSet<K!> visibility:public modality:OPEN flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-keys> visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K, V>) returnType:(kotlin.collections.MutableSet<(K..K?)>..kotlin.collections.Set<(K..K?)>?) flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:keys type:kotlin.collections.MutableSet<K!> visibility:public modality:OPEN flags:val
           overridden:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-keys> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap<K, V>) returnType:MutableSet<K> flags:
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractMap<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:OPEN flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-size> visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K, V>) returnType:Int flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:OPEN flags:val
           overridden:
             FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map<K, V>) returnType:Int flags:
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractMap<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.MutableCollection<V!> visibility:public modality:OPEN flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-values> visibility:public modality:OPEN <> ($this:java.util.AbstractMap<K, V>) returnType:(kotlin.collections.MutableCollection<(V..V?)>..kotlin.collections.Collection<(V..V?)>?) flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.MutableCollection<V!> visibility:public modality:OPEN flags:val
           overridden:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-values> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap<K, V>) returnType:MutableCollection<V> flags:
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:java.util.AbstractMap<K, V> flags:
@@ -2581,15 +2609,19 @@ MODULE_FRAGMENT name:<dependencies of test-module>
         VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:key index:0 type:K flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:entries type:kotlin.collections.Set<kotlin.collections.Map.Entry<K, V>> visibility:public modality:ABSTRACT flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-entries> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map<K, V>) returnType:Set<Entry<K, V>> flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:entries type:kotlin.collections.Set<kotlin.collections.Map.Entry<K, V>> visibility:public modality:ABSTRACT flags:val
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.Map<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:keys type:kotlin.collections.Set<K> visibility:public modality:ABSTRACT flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-keys> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map<K, V>) returnType:Set<K> flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:keys type:kotlin.collections.Set<K> visibility:public modality:ABSTRACT flags:val
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.Map<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:ABSTRACT flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-size> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map<K, V>) returnType:Int flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:ABSTRACT flags:val
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.Map<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.Collection<V> visibility:public modality:ABSTRACT flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-values> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map<K, V>) returnType:Collection<V> flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.Collection<V> visibility:public modality:ABSTRACT flags:val
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.Map<K, V> flags:
       CLASS IR_EXTERNAL_DECLARATION_STUB INTERFACE name:Entry modality:ABSTRACT visibility:public flags:
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.Map.Entry<K, V> flags:
@@ -2599,9 +2631,11 @@ MODULE_FRAGMENT name:<dependencies of test-module>
         TYPE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:V index:1 variance:out upperBounds:[kotlin.Any?]
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K visibility:public modality:ABSTRACT flags:val
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-key> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.Entry<K, V>) returnType:K flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K visibility:public modality:ABSTRACT flags:val
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.Map.Entry<K, V> flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V visibility:public modality:ABSTRACT flags:val
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-value> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.Entry<K, V>) returnType:V flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V visibility:public modality:ABSTRACT flags:val
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.Map.Entry<K, V> flags:
         FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags:
           overridden:
@@ -2681,21 +2715,25 @@ MODULE_FRAGMENT name:<dependencies of test-module>
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.Map<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:ABSTRACT flags:val
         FUN FAKE_OVERRIDE name:<get-size> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map<K, V>) returnType:Int flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public modality:ABSTRACT flags:val
           overridden:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-size> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map<K, V>) returnType:Int flags:
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.Map<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:entries type:kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K, V>> visibility:public modality:ABSTRACT flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-entries> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap<K, V>) returnType:MutableSet<MutableEntry<K, V>> flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:entries type:kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K, V>> visibility:public modality:ABSTRACT flags:val
           overridden:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-entries> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map<K, V>) returnType:Set<Entry<K, V>> flags:
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.MutableMap<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:keys type:kotlin.collections.MutableSet<K> visibility:public modality:ABSTRACT flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-keys> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap<K, V>) returnType:MutableSet<K> flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:keys type:kotlin.collections.MutableSet<K> visibility:public modality:ABSTRACT flags:val
           overridden:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-keys> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map<K, V>) returnType:Set<K> flags:
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.MutableMap<K, V> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.MutableCollection<V> visibility:public modality:ABSTRACT flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-values> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap<K, V>) returnType:MutableCollection<V> flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.MutableCollection<V> visibility:public modality:ABSTRACT flags:val
           overridden:
             FUN IR_EXTERNAL_DECLARATION_STUB name:<get-values> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map<K, V>) returnType:Collection<V> flags:
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.MutableMap<K, V> flags:
@@ -2710,11 +2748,13 @@ MODULE_FRAGMENT name:<dependencies of test-module>
           VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:newValue index:0 type:V flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K visibility:public modality:ABSTRACT flags:val
           FUN FAKE_OVERRIDE name:<get-key> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.Entry<K, V>) returnType:K flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K visibility:public modality:ABSTRACT flags:val
             overridden:
               FUN IR_EXTERNAL_DECLARATION_STUB name:<get-key> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.Entry<K, V>) returnType:K flags:
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.Map.Entry<K, V> flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V visibility:public modality:ABSTRACT flags:val
           FUN FAKE_OVERRIDE name:<get-value> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.Entry<K, V>) returnType:V flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V visibility:public modality:ABSTRACT flags:val
             overridden:
               FUN IR_EXTERNAL_DECLARATION_STUB name:<get-value> visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Map.Entry<K, V>) returnType:V flags:
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.Map.Entry<K, V> flags:
@@ -2811,9 +2851,11 @@ MODULE_FRAGMENT name:<dependencies of test-module>
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Pair<A, B> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:first type:A visibility:public modality:FINAL flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-first> visibility:public modality:FINAL <> ($this:kotlin.Pair<A, B>) returnType:A flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:first type:A visibility:public modality:FINAL flags:val
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Pair<A, B> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:second type:B visibility:public modality:FINAL flags:val
         FUN IR_EXTERNAL_DECLARATION_STUB name:<get-second> visibility:public modality:FINAL <> ($this:kotlin.Pair<A, B>) returnType:B flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:second type:B visibility:public modality:FINAL flags:val
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Pair<A, B> flags:
       FUN IR_EXTERNAL_DECLARATION_STUB name:equals visibility:public modality:OPEN <> ($this:kotlin.Pair<A, B>, other:kotlin.Any?) returnType:Boolean flags:
         overridden:
diff --git a/compiler/testData/ir/irText/stubs/javaEnum.txt b/compiler/testData/ir/irText/stubs/javaEnum.txt
index b119ca9da91..4a33d5480d2 100644
--- a/compiler/testData/ir/irText/stubs/javaEnum.txt
+++ b/compiler/testData/ir/irText/stubs/javaEnum.txt
@@ -4,6 +4,7 @@ FILE fqName:<root> fileName:/javaEnum.kt
       EXPRESSION_BODY
         GET_ENUM 'ONE' type=JEnum
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:JEnum flags:
+      correspondingProperty: PROPERTY name:test type:JEnum visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test>(): JEnum'
           GET_FIELD 'test: JEnum' type=JEnum origin=null
diff --git a/compiler/testData/ir/irText/stubs/javaEnum__testmodule.txt b/compiler/testData/ir/irText/stubs/javaEnum__testmodule.txt
index 53b4e5d9d6f..dccfe89db6f 100644
--- a/compiler/testData/ir/irText/stubs/javaEnum__testmodule.txt
+++ b/compiler/testData/ir/irText/stubs/javaEnum__testmodule.txt
@@ -36,11 +36,13 @@ MODULE_FRAGMENT name:<test-module>
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Enum<JEnum!> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:name type:kotlin.String visibility:public modality:FINAL flags:val
         FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<JEnum!>) returnType:String flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:name type:kotlin.String visibility:public modality:FINAL flags:val
           overridden:
             UNBOUND: fun <get-name>(): kotlin.String
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Enum<JEnum!> flags:
       PROPERTY IR_EXTERNAL_DECLARATION_STUB name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
         FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<JEnum!>) returnType:Int flags:
+          correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:ordinal type:kotlin.Int visibility:public modality:FINAL flags:val
           overridden:
             UNBOUND: fun <get-ordinal>(): kotlin.Int
           $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Enum<JEnum!> flags:
diff --git a/compiler/testData/ir/irText/stubs/javaInnerClass.txt b/compiler/testData/ir/irText/stubs/javaInnerClass.txt
index 62cea62725d..d88adc7847a 100644
--- a/compiler/testData/ir/irText/stubs/javaInnerClass.txt
+++ b/compiler/testData/ir/irText/stubs/javaInnerClass.txt
@@ -13,6 +13,7 @@ FILE fqName:<root> fileName:/javaInnerClass.kt
           CALL 'constructor JInner()' type=J.JInner origin=null
             $this: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> ($this:Test1) returnType:JInner flags:
+        correspondingProperty: PROPERTY name:test type:J.JInner visibility:public modality:FINAL flags:val
         $this: VALUE_PARAMETER name:<this> type:Test1 flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test>(): J.JInner'
diff --git a/compiler/testData/ir/irText/stubs/simple.txt b/compiler/testData/ir/irText/stubs/simple.txt
index 2a7b0936b51..e12478a48e1 100644
--- a/compiler/testData/ir/irText/stubs/simple.txt
+++ b/compiler/testData/ir/irText/stubs/simple.txt
@@ -6,6 +6,7 @@ FILE fqName:<root> fileName:/simple.kt
           $this: CONST Int type=kotlin.Int value=2
           other: CONST Int type=kotlin.Int value=2
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:Int flags:
+      correspondingProperty: PROPERTY name:test type:kotlin.Int visibility:public modality:FINAL flags:val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test>(): Int'
           GET_FIELD 'test: Int' type=kotlin.Int origin=null
diff --git a/compiler/testData/ir/irText/stubs/simple__builtinsmodule.txt b/compiler/testData/ir/irText/stubs/simple__builtinsmodule.txt
index 35c3be67f7c..481d258d546 100644
--- a/compiler/testData/ir/irText/stubs/simple__builtinsmodule.txt
+++ b/compiler/testData/ir/irText/stubs/simple__builtinsmodule.txt
@@ -50,9 +50,11 @@ MODULE_FRAGMENT name:<built-ins module>
         CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:private <> () returnType:kotlin.Int.Companion flags:primary
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_VALUE type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-MAX_VALUE> visibility:public modality:FINAL <> ($this:kotlin.Int.Companion) returnType:Int flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_VALUE type:kotlin.Int visibility:public modality:FINAL flags:const,val
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int.Companion flags:
         PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MIN_VALUE type:kotlin.Int visibility:public modality:FINAL flags:const,val
           FUN IR_EXTERNAL_DECLARATION_STUB name:<get-MIN_VALUE> visibility:public modality:FINAL <> ($this:kotlin.Int.Companion) returnType:Int flags:
+            correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MIN_VALUE type:kotlin.Int visibility:public modality:FINAL flags:const,val
             $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int.Companion flags:
         FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags:
           overridden: