From 5bed6c296d7e67f0161bd24403cb21dbf17becc7 Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Wed, 20 Mar 2013 18:23:38 +0400
Subject: [PATCH] Test update after "Refactoring: code duplication removed from
 accessor generators" and "Properly resolve descriptors from compiled kotlin"
 fixes

---
 compiler/testData/loadKotlin/class/NamedObject.txt          | 1 +
 .../testData/loadKotlin/class/NamedObjectInClassObject.txt  | 1 +
 .../testData/loadKotlin/class/NamedObjectInNamedObject.txt  | 1 +
 .../class/NamedObjectWithAnotherTopLevelProperty.txt        | 2 ++
 .../loadKotlin/classObject/ClassObjectDeclaresVal.txt       | 1 +
 .../loadKotlin/classObject/ClassObjectDeclaresVar.txt       | 2 ++
 .../constructor/ConstructorCollectionParameter.txt          | 1 +
 compiler/testData/loadKotlin/dataClass/MixedComponents.txt  | 3 +++
 compiler/testData/loadKotlin/dataClass/OneVal.txt           | 1 +
 compiler/testData/loadKotlin/dataClass/OpenDataClass.txt    | 1 +
 .../loadKotlin/dataClass/OpenPropertyFinalComponent.txt     | 1 +
 compiler/testData/loadKotlin/dataClass/TwoVals.txt          | 2 ++
 compiler/testData/loadKotlin/dataClass/TwoVars.txt          | 4 ++++
 compiler/testData/loadKotlin/prop/ClassVal.txt              | 1 +
 compiler/testData/loadKotlin/prop/ClassValAbstract.txt      | 1 +
 compiler/testData/loadKotlin/prop/ClassVar.txt              | 2 ++
 compiler/testData/loadKotlin/prop/CollectionSize.txt        | 1 +
 compiler/testData/loadKotlin/prop/ExtValClass.txt           | 1 +
 compiler/testData/loadKotlin/prop/ExtValInClass.txt         | 1 +
 compiler/testData/loadKotlin/prop/ExtValInt.txt             | 1 +
 compiler/testData/loadKotlin/prop/ExtValIntCharSequence.txt | 1 +
 .../testData/loadKotlin/prop/ExtValIntCharSequenceQ.txt     | 1 +
 .../testData/loadKotlin/prop/ExtValIntListQOfIntInClass.txt | 1 +
 compiler/testData/loadKotlin/prop/ExtValIntTInClass.txt     | 1 +
 compiler/testData/loadKotlin/prop/ExtValIntTQInClass.txt    | 1 +
 compiler/testData/loadKotlin/prop/ExtValTIntInClass.txt     | 1 +
 compiler/testData/loadKotlin/prop/ExtVarClass.txt           | 2 ++
 compiler/testData/loadKotlin/prop/ExtVarInClass.txt         | 2 ++
 compiler/testData/loadKotlin/prop/ExtVarInt.txt             | 2 ++
 compiler/testData/loadKotlin/prop/ExtVarIntTInClass.txt     | 2 ++
 compiler/testData/loadKotlin/prop/ExtVarIntTQInClass.txt    | 2 ++
 compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt        | 2 ++
 compiler/testData/loadKotlin/prop/ExtVarTIntInClass.txt     | 2 ++
 compiler/testData/loadKotlin/prop/ExtVarTQIntInClass.txt    | 2 ++
 compiler/testData/loadKotlin/prop/ExtVarl.txt               | 3 +++
 compiler/testData/loadKotlin/prop/NsVal.txt                 | 1 +
 compiler/testData/loadKotlin/prop/NsVar.txt                 | 2 ++
 compiler/testData/loadKotlin/prop/OverrideClassVal.txt      | 2 ++
 compiler/testData/loadKotlin/prop/OverrideTraitVal.txt      | 2 ++
 compiler/testData/loadKotlin/prop/PropFromSuperclass.txt    | 2 ++
 compiler/testData/loadKotlin/prop/TraitFinalVar.txt         | 2 ++
 compiler/testData/loadKotlin/prop/TraitOpenVal.txt          | 1 +
 .../testData/loadKotlin/prop/VarDelegationToTraitImpl.txt   | 4 ++++
 .../visibility/InternalAbstractTraitMembersOverridden.txt   | 6 ++++++
 .../loadKotlin/visibility/InternalTopLevelMembers.txt       | 1 +
 .../testData/loadKotlin/visibility/InternalTraitMembers.txt | 3 +++
 .../loadKotlin/visibility/InternalTraitMembersInherited.txt | 6 ++++++
 .../testData/loadKotlin/visibility/PrivateTopLevelVal.txt   | 1 +
 .../loadKotlin/visibility/TopLevelVarWithPrivateSetter.txt  | 2 ++
 49 files changed, 89 insertions(+)

diff --git a/compiler/testData/loadKotlin/class/NamedObject.txt b/compiler/testData/loadKotlin/class/NamedObject.txt
index 11a9e80202b..99153e442cc 100644
--- a/compiler/testData/loadKotlin/class/NamedObject.txt
+++ b/compiler/testData/loadKotlin/class/NamedObject.txt
@@ -5,5 +5,6 @@ public val Obj : test.Obj
 public object Obj {
     /*primary*/ private constructor Obj()
     public final val v : jet.String
+        public final fun <get-v>() : jet.String
     public final fun f() : jet.String
 }
diff --git a/compiler/testData/loadKotlin/class/NamedObjectInClassObject.txt b/compiler/testData/loadKotlin/class/NamedObjectInClassObject.txt
index 65625bfd803..137c3a8930f 100644
--- a/compiler/testData/loadKotlin/class/NamedObjectInClassObject.txt
+++ b/compiler/testData/loadKotlin/class/NamedObjectInClassObject.txt
@@ -10,6 +10,7 @@ public final class Outer {
         public object Obj {
             /*primary*/ private constructor Obj()
             public final val v : jet.String
+                public final fun <get-v>() : jet.String
             public final fun f() : jet.String
         }
     }
diff --git a/compiler/testData/loadKotlin/class/NamedObjectInNamedObject.txt b/compiler/testData/loadKotlin/class/NamedObjectInNamedObject.txt
index 72e29f74cc4..6a5c9ab4f5b 100644
--- a/compiler/testData/loadKotlin/class/NamedObjectInNamedObject.txt
+++ b/compiler/testData/loadKotlin/class/NamedObjectInNamedObject.txt
@@ -9,6 +9,7 @@ public object Outer {
     public object Obj {
         /*primary*/ private constructor Obj()
         public final val v : jet.String
+            public final fun <get-v>() : jet.String
         public final fun f() : jet.String
     }
 }
diff --git a/compiler/testData/loadKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt b/compiler/testData/loadKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
index 654bfd8af53..a798fce18d7 100644
--- a/compiler/testData/loadKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
+++ b/compiler/testData/loadKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
@@ -2,9 +2,11 @@ package test
 
 public val Obj : test.Obj
 internal val x : jet.Int
+    internal fun <get-x>() : jet.Int
 
 public object Obj {
     /*primary*/ private constructor Obj()
     public final val v : jet.String
+        public final fun <get-v>() : jet.String
     public final fun f() : jet.String
 }
diff --git a/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVal.txt b/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVal.txt
index a1e742f73bc..0977c918c55 100644
--- a/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVal.txt
+++ b/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVal.txt
@@ -6,5 +6,6 @@ internal final class ClassObjectDeclaresProperty {
     internal class object <class-object-for-ClassObjectDeclaresProperty> {
         /*primary*/ private constructor <class-object-for-ClassObjectDeclaresProperty>()
         internal final val i : jet.Int
+            internal final fun <get-i>() : jet.Int
     }
 }
diff --git a/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.txt b/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.txt
index 91578b9ee27..ba8768551b7 100644
--- a/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.txt
+++ b/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.txt
@@ -6,5 +6,7 @@ internal final class ClassObjectDeclaresProperty {
     internal class object <class-object-for-ClassObjectDeclaresProperty> {
         /*primary*/ private constructor <class-object-for-ClassObjectDeclaresProperty>()
         internal final var s : jet.String
+            internal final fun <get-s>() : jet.String
+            internal final fun <set-s>(/*0*/ <set-?> : jet.String) : Unit
     }
 }
diff --git a/compiler/testData/loadKotlin/constructor/ConstructorCollectionParameter.txt b/compiler/testData/loadKotlin/constructor/ConstructorCollectionParameter.txt
index 9c0b79cd8ad..8eb1389b8e5 100644
--- a/compiler/testData/loadKotlin/constructor/ConstructorCollectionParameter.txt
+++ b/compiler/testData/loadKotlin/constructor/ConstructorCollectionParameter.txt
@@ -3,4 +3,5 @@ package test
 internal final class TestingKotlinCollections {
     /*primary*/ public constructor TestingKotlinCollections(/*0*/ arguments : jet.Collection<jet.String>)
     internal final val arguments : jet.Collection<jet.String>
+        internal final fun <get-arguments>() : jet.Collection<jet.String>
 }
diff --git a/compiler/testData/loadKotlin/dataClass/MixedComponents.txt b/compiler/testData/loadKotlin/dataClass/MixedComponents.txt
index b00354736a2..c213347d034 100644
--- a/compiler/testData/loadKotlin/dataClass/MixedComponents.txt
+++ b/compiler/testData/loadKotlin/dataClass/MixedComponents.txt
@@ -3,7 +3,10 @@ package test
 jet.data() internal final class DataClass {
     /*primary*/ public constructor DataClass(/*0*/ x : jet.String, /*1*/ y : jet.Int, /*2*/ z : jet.Double)
     internal final var x : jet.String
+        internal final fun <get-x>() : jet.String
+        internal final fun <set-x>(/*0*/ <set-?> : jet.String) : Unit
     internal final val z : jet.Double
+        internal final fun <get-z>() : jet.Double
     internal final /*synthesized*/ fun component1() : jet.String
     internal final /*synthesized*/ fun component2() : jet.Double
     internal final /*synthesized*/ fun copy(/*0*/ x : jet.String = ..., /*1*/ y : jet.Int, /*2*/ z : jet.Double = ...) : test.DataClass
diff --git a/compiler/testData/loadKotlin/dataClass/OneVal.txt b/compiler/testData/loadKotlin/dataClass/OneVal.txt
index e0f6267370a..0e0add83a04 100644
--- a/compiler/testData/loadKotlin/dataClass/OneVal.txt
+++ b/compiler/testData/loadKotlin/dataClass/OneVal.txt
@@ -3,6 +3,7 @@ package test
 jet.data() internal final class DataClass {
     /*primary*/ public constructor DataClass(/*0*/ x : jet.String)
     internal final val x : jet.String
+        internal final fun <get-x>() : jet.String
     internal final /*synthesized*/ fun component1() : jet.String
     internal final /*synthesized*/ fun copy(/*0*/ x : jet.String = ...) : test.DataClass
 }
diff --git a/compiler/testData/loadKotlin/dataClass/OpenDataClass.txt b/compiler/testData/loadKotlin/dataClass/OpenDataClass.txt
index 900923ea4d6..76a0f8c09cf 100644
--- a/compiler/testData/loadKotlin/dataClass/OpenDataClass.txt
+++ b/compiler/testData/loadKotlin/dataClass/OpenDataClass.txt
@@ -3,6 +3,7 @@ package test
 jet.data() internal open class DataClass {
     /*primary*/ public constructor DataClass(/*0*/ x : jet.String)
     internal final val x : jet.String
+        internal final fun <get-x>() : jet.String
     internal final /*synthesized*/ fun component1() : jet.String
     internal final /*synthesized*/ fun copy(/*0*/ x : jet.String = ...) : test.DataClass
 }
diff --git a/compiler/testData/loadKotlin/dataClass/OpenPropertyFinalComponent.txt b/compiler/testData/loadKotlin/dataClass/OpenPropertyFinalComponent.txt
index 258ef08d740..c4d3a929272 100644
--- a/compiler/testData/loadKotlin/dataClass/OpenPropertyFinalComponent.txt
+++ b/compiler/testData/loadKotlin/dataClass/OpenPropertyFinalComponent.txt
@@ -3,6 +3,7 @@ package test
 jet.data() internal open class DataClass {
     /*primary*/ public constructor DataClass(/*0*/ x : jet.String)
     internal open val x : jet.String
+        internal open fun <get-x>() : jet.String
     internal final /*synthesized*/ fun component1() : jet.String
     internal final /*synthesized*/ fun copy(/*0*/ x : jet.String = ...) : test.DataClass
 }
diff --git a/compiler/testData/loadKotlin/dataClass/TwoVals.txt b/compiler/testData/loadKotlin/dataClass/TwoVals.txt
index 9a33c2c4afa..47ea2768297 100644
--- a/compiler/testData/loadKotlin/dataClass/TwoVals.txt
+++ b/compiler/testData/loadKotlin/dataClass/TwoVals.txt
@@ -3,7 +3,9 @@ package test
 jet.data() internal final class DataClass {
     /*primary*/ public constructor DataClass(/*0*/ x : jet.String, /*1*/ y : jet.Int)
     internal final val x : jet.String
+        internal final fun <get-x>() : jet.String
     internal final val y : jet.Int
+        internal final fun <get-y>() : jet.Int
     internal final /*synthesized*/ fun component1() : jet.String
     internal final /*synthesized*/ fun component2() : jet.Int
     internal final /*synthesized*/ fun copy(/*0*/ x : jet.String = ..., /*1*/ y : jet.Int = ...) : test.DataClass
diff --git a/compiler/testData/loadKotlin/dataClass/TwoVars.txt b/compiler/testData/loadKotlin/dataClass/TwoVars.txt
index e42b45cd2fb..0ff20f3a850 100644
--- a/compiler/testData/loadKotlin/dataClass/TwoVars.txt
+++ b/compiler/testData/loadKotlin/dataClass/TwoVars.txt
@@ -3,7 +3,11 @@ package test
 jet.data() internal final class DataClass {
     /*primary*/ public constructor DataClass(/*0*/ x : jet.String, /*1*/ y : jet.Int)
     internal final var x : jet.String
+        internal final fun <get-x>() : jet.String
+        internal final fun <set-x>(/*0*/ <set-?> : jet.String) : Unit
     internal final var y : jet.Int
+        internal final fun <get-y>() : jet.Int
+        internal final fun <set-y>(/*0*/ <set-?> : jet.Int) : Unit
     internal final /*synthesized*/ fun component1() : jet.String
     internal final /*synthesized*/ fun component2() : jet.Int
     internal final /*synthesized*/ fun copy(/*0*/ x : jet.String = ..., /*1*/ y : jet.Int = ...) : test.DataClass
diff --git a/compiler/testData/loadKotlin/prop/ClassVal.txt b/compiler/testData/loadKotlin/prop/ClassVal.txt
index 71d8bbeb2a7..b0f54e8dad5 100644
--- a/compiler/testData/loadKotlin/prop/ClassVal.txt
+++ b/compiler/testData/loadKotlin/prop/ClassVal.txt
@@ -3,4 +3,5 @@ package test
 internal final class ClassVal {
     /*primary*/ public constructor ClassVal()
     internal final val aa : jet.Int
+        internal final fun <get-aa>() : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/prop/ClassValAbstract.txt b/compiler/testData/loadKotlin/prop/ClassValAbstract.txt
index c8a0be4c663..3ac72920a32 100644
--- a/compiler/testData/loadKotlin/prop/ClassValAbstract.txt
+++ b/compiler/testData/loadKotlin/prop/ClassValAbstract.txt
@@ -3,4 +3,5 @@ package test
 internal abstract class ClassValAbstract {
     /*primary*/ public constructor ClassValAbstract()
     internal abstract val a : jet.Int
+        internal abstract fun <get-a>() : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/prop/ClassVar.txt b/compiler/testData/loadKotlin/prop/ClassVar.txt
index 6129d2dc014..b2095dd5920 100644
--- a/compiler/testData/loadKotlin/prop/ClassVar.txt
+++ b/compiler/testData/loadKotlin/prop/ClassVar.txt
@@ -3,4 +3,6 @@ package test
 internal final class ClassVar {
     /*primary*/ public constructor ClassVar()
     internal final var aa : jet.Int
+        internal final fun <get-aa>() : jet.Int
+        internal final fun <set-aa>(/*0*/ <set-?> : jet.Int) : Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/CollectionSize.txt b/compiler/testData/loadKotlin/prop/CollectionSize.txt
index 7523e67b6d1..6e51493add0 100644
--- a/compiler/testData/loadKotlin/prop/CollectionSize.txt
+++ b/compiler/testData/loadKotlin/prop/CollectionSize.txt
@@ -1,3 +1,4 @@
 package test
 
 internal val jet.Collection<jet.Any?>.anotherSize : jet.Int
+    internal fun jet.Collection<jet.Any?>.<get-anotherSize>() : jet.Int
diff --git a/compiler/testData/loadKotlin/prop/ExtValClass.txt b/compiler/testData/loadKotlin/prop/ExtValClass.txt
index 5fad88ab9b3..25fd16b856e 100644
--- a/compiler/testData/loadKotlin/prop/ExtValClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValClass.txt
@@ -1,3 +1,4 @@
 package test
 
 internal val </*0*/ P> P.anotherJavaClass : java.lang.Class<P>
+    internal fun P.<get-anotherJavaClass>() : java.lang.Class<P>
diff --git a/compiler/testData/loadKotlin/prop/ExtValInClass.txt b/compiler/testData/loadKotlin/prop/ExtValInClass.txt
index f8e4ef83ec2..7d8807027eb 100644
--- a/compiler/testData/loadKotlin/prop/ExtValInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValInClass.txt
@@ -3,4 +3,5 @@ package test
 internal final class ExtPropInClass {
     /*primary*/ public constructor ExtPropInClass()
     internal final val jet.Int.itIs : jet.Int
+        internal final fun jet.Int.<get-itIs>() : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtValInt.txt b/compiler/testData/loadKotlin/prop/ExtValInt.txt
index 4ce58ebf9a5..9cf933b9345 100644
--- a/compiler/testData/loadKotlin/prop/ExtValInt.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValInt.txt
@@ -1,3 +1,4 @@
 package test
 
 internal val jet.Int.itIs : jet.Int
+    internal fun jet.Int.<get-itIs>() : jet.Int
diff --git a/compiler/testData/loadKotlin/prop/ExtValIntCharSequence.txt b/compiler/testData/loadKotlin/prop/ExtValIntCharSequence.txt
index b748a54e314..603b62e1877 100644
--- a/compiler/testData/loadKotlin/prop/ExtValIntCharSequence.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValIntCharSequence.txt
@@ -1,3 +1,4 @@
 package test
 
 internal val jet.Int.ggg : java.lang.CharSequence
+    internal fun jet.Int.<get-ggg>() : java.lang.CharSequence
diff --git a/compiler/testData/loadKotlin/prop/ExtValIntCharSequenceQ.txt b/compiler/testData/loadKotlin/prop/ExtValIntCharSequenceQ.txt
index 6cadda3ca20..9d29f8f1c69 100644
--- a/compiler/testData/loadKotlin/prop/ExtValIntCharSequenceQ.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValIntCharSequenceQ.txt
@@ -1,3 +1,4 @@
 package test
 
 internal val jet.Int.ggg : java.lang.CharSequence?
+    internal fun jet.Int.<get-ggg>() : java.lang.CharSequence?
diff --git a/compiler/testData/loadKotlin/prop/ExtValIntListQOfIntInClass.txt b/compiler/testData/loadKotlin/prop/ExtValIntListQOfIntInClass.txt
index 20ca5a0d087..a7517cf799a 100644
--- a/compiler/testData/loadKotlin/prop/ExtValIntListQOfIntInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValIntListQOfIntInClass.txt
@@ -3,4 +3,5 @@ package test
 internal final class ExtValInClass {
     /*primary*/ public constructor ExtValInClass()
     internal final val jet.Int.asas : java.util.List<jet.Int>?
+        internal final fun jet.Int.<get-asas>() : java.util.List<jet.Int>?
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtValIntTInClass.txt b/compiler/testData/loadKotlin/prop/ExtValIntTInClass.txt
index c5105365d55..6085ab101f4 100644
--- a/compiler/testData/loadKotlin/prop/ExtValIntTInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValIntTInClass.txt
@@ -3,4 +3,5 @@ package test
 internal final class ExtValInClass</*0*/ T> {
     /*primary*/ public constructor ExtValInClass</*0*/ T>()
     internal final val jet.Int.asas : T
+        internal final fun jet.Int.<get-asas>() : T
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtValIntTQInClass.txt b/compiler/testData/loadKotlin/prop/ExtValIntTQInClass.txt
index 9a04004af84..65dce66187e 100644
--- a/compiler/testData/loadKotlin/prop/ExtValIntTQInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValIntTQInClass.txt
@@ -3,4 +3,5 @@ package test
 internal final class ExtValInClass</*0*/ P> {
     /*primary*/ public constructor ExtValInClass</*0*/ P>()
     internal final val jet.Int.asas : P?
+        internal final fun jet.Int.<get-asas>() : P?
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtValTIntInClass.txt b/compiler/testData/loadKotlin/prop/ExtValTIntInClass.txt
index 3464bbe5fd8..798886c32f0 100644
--- a/compiler/testData/loadKotlin/prop/ExtValTIntInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValTIntInClass.txt
@@ -3,4 +3,5 @@ package test
 internal final class ExtValPIntInClass</*0*/ P> {
     /*primary*/ public constructor ExtValPIntInClass</*0*/ P>()
     internal final val P.asas : jet.Int
+        internal final fun P.<get-asas>() : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtVarClass.txt b/compiler/testData/loadKotlin/prop/ExtVarClass.txt
index 1fb4144a04d..f7e922ff66d 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarClass.txt
@@ -1,3 +1,5 @@
 package test
 
 internal var </*0*/ P> P.anotherJavaClass : java.lang.Class<P>
+    internal fun P.<get-anotherJavaClass>() : java.lang.Class<P>
+    internal fun P.<set-anotherJavaClass>(/*0*/ p : java.lang.Class<P>) : Unit
diff --git a/compiler/testData/loadKotlin/prop/ExtVarInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarInClass.txt
index 4152ec3d0d0..8a454641994 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarInClass.txt
@@ -3,4 +3,6 @@ package test
 internal final class ExtPropInClass {
     /*primary*/ public constructor ExtPropInClass()
     internal final var jet.Int.itIs : jet.Int
+        internal final fun jet.Int.<get-itIs>() : jet.Int
+        internal final fun jet.Int.<set-itIs>(/*0*/ p : jet.Int) : Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtVarInt.txt b/compiler/testData/loadKotlin/prop/ExtVarInt.txt
index 77e89d5bb92..c61d2a06d21 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarInt.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarInt.txt
@@ -1,3 +1,5 @@
 package test
 
 internal var jet.Int.ggg : jet.Int
+    internal fun jet.Int.<get-ggg>() : jet.Int
+    internal fun jet.Int.<set-ggg>(/*0*/ p : jet.Int) : Unit
diff --git a/compiler/testData/loadKotlin/prop/ExtVarIntTInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarIntTInClass.txt
index 1056dc05d53..887055b5236 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarIntTInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarIntTInClass.txt
@@ -3,4 +3,6 @@ package test
 internal final class ExtValInClass</*0*/ P> {
     /*primary*/ public constructor ExtValInClass</*0*/ P>()
     internal final var jet.Int.asas : P
+        internal final fun jet.Int.<get-asas>() : P
+        internal final fun jet.Int.<set-asas>(/*0*/ p : P) : Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtVarIntTQInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarIntTQInClass.txt
index 9141f918f9d..1ccb8f40ea1 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarIntTQInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarIntTQInClass.txt
@@ -3,4 +3,6 @@ package test
 internal final class ExtValInClass</*0*/ P> {
     /*primary*/ public constructor ExtValInClass</*0*/ P>()
     internal final var jet.Int.asas : P?
+        internal final fun jet.Int.<get-asas>() : P?
+        internal final fun jet.Int.<set-asas>(/*0*/ p : P?) : Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt b/compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt
index b7b978bcf3c..d343d1f92d9 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt
@@ -1,3 +1,5 @@
 package test
 
 internal var </*0*/ P, /*1*/ Q> jet.Map<P, Q>.asas : jet.Int
+    internal fun jet.Map<P, Q>.<get-asas>() : jet.Int
+    internal fun jet.Map<P, Q>.<set-asas>(/*0*/ i : jet.Int) : Unit
diff --git a/compiler/testData/loadKotlin/prop/ExtVarTIntInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarTIntInClass.txt
index 3954180c9eb..35832907c05 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarTIntInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarTIntInClass.txt
@@ -3,4 +3,6 @@ package test
 internal final class ExtValPIntInClass</*0*/ P> {
     /*primary*/ public constructor ExtValPIntInClass</*0*/ P>()
     internal final var P.asas : jet.Int
+        internal final fun P.<get-asas>() : jet.Int
+        internal final fun P.<set-asas>(/*0*/ p : jet.Int) : Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtVarTQIntInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarTQIntInClass.txt
index 1e65ec2310e..d70d226b308 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarTQIntInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarTQIntInClass.txt
@@ -3,4 +3,6 @@ package test
 internal final class ExtValPIntInClass</*0*/ P> {
     /*primary*/ public constructor ExtValPIntInClass</*0*/ P>()
     internal final var P?.asas : jet.Int
+        internal final fun P?.<get-asas>() : jet.Int
+        internal final fun P?.<set-asas>(/*0*/ p : jet.Int) : Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtVarl.txt b/compiler/testData/loadKotlin/prop/ExtVarl.txt
index fdc1787384c..39db4729d25 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarl.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarl.txt
@@ -1,4 +1,7 @@
 package test
 
 internal var jet.Int.junk : jet.Short
+    internal fun jet.Int.<get-junk>() : jet.Short
+    internal fun jet.Int.<set-junk>(/*0*/ p : jet.Short) : Unit
 internal val jet.String.junk : jet.Int
+    internal fun jet.String.<get-junk>() : jet.Int
diff --git a/compiler/testData/loadKotlin/prop/NsVal.txt b/compiler/testData/loadKotlin/prop/NsVal.txt
index b42bcc2c171..f48c9470341 100644
--- a/compiler/testData/loadKotlin/prop/NsVal.txt
+++ b/compiler/testData/loadKotlin/prop/NsVal.txt
@@ -1,3 +1,4 @@
 package test
 
 internal val nsVal : jet.Int
+    internal fun <get-nsVal>() : jet.Int
diff --git a/compiler/testData/loadKotlin/prop/NsVar.txt b/compiler/testData/loadKotlin/prop/NsVar.txt
index f6b14e68fd3..118612f8376 100644
--- a/compiler/testData/loadKotlin/prop/NsVar.txt
+++ b/compiler/testData/loadKotlin/prop/NsVar.txt
@@ -1,3 +1,5 @@
 package test
 
 internal var nsVal : jet.Int
+    internal fun <get-nsVal>() : jet.Int
+    internal fun <set-nsVal>(/*0*/ <set-?> : jet.Int) : Unit
diff --git a/compiler/testData/loadKotlin/prop/OverrideClassVal.txt b/compiler/testData/loadKotlin/prop/OverrideClassVal.txt
index 9883d919c99..6988af97340 100644
--- a/compiler/testData/loadKotlin/prop/OverrideClassVal.txt
+++ b/compiler/testData/loadKotlin/prop/OverrideClassVal.txt
@@ -3,9 +3,11 @@ package test
 internal open class BaseClass {
     /*primary*/ public constructor BaseClass()
     internal open val shape : jet.String
+        internal open fun <get-shape>() : jet.String
 }
 
 internal open class Subclass : test.BaseClass {
     /*primary*/ public constructor Subclass()
     internal open override /*1*/ val shape : jet.String
+        internal open override /*1*/ fun <get-shape>() : jet.String
 }
diff --git a/compiler/testData/loadKotlin/prop/OverrideTraitVal.txt b/compiler/testData/loadKotlin/prop/OverrideTraitVal.txt
index 26a27002679..d525d6459dd 100644
--- a/compiler/testData/loadKotlin/prop/OverrideTraitVal.txt
+++ b/compiler/testData/loadKotlin/prop/OverrideTraitVal.txt
@@ -3,8 +3,10 @@ package test
 internal open class Subclass : test.Trait {
     /*primary*/ public constructor Subclass()
     internal open override /*1*/ val shape : jet.String
+        internal open override /*1*/ fun <get-shape>() : jet.String
 }
 
 internal trait Trait {
     internal abstract val shape : jet.String
+        internal abstract fun <get-shape>() : jet.String
 }
diff --git a/compiler/testData/loadKotlin/prop/PropFromSuperclass.txt b/compiler/testData/loadKotlin/prop/PropFromSuperclass.txt
index 2762e544306..2abbc346047 100644
--- a/compiler/testData/loadKotlin/prop/PropFromSuperclass.txt
+++ b/compiler/testData/loadKotlin/prop/PropFromSuperclass.txt
@@ -3,9 +3,11 @@ package test
 internal open class BaseClass {
     /*primary*/ public constructor BaseClass()
     internal final val exactly : jet.Int
+        internal final fun <get-exactly>() : jet.Int
 }
 
 internal final class Subclass : test.BaseClass {
     /*primary*/ public constructor Subclass()
     internal final override /*1*/ /*fake_override*/ val exactly : jet.Int
+        internal final override /*1*/ /*fake_override*/ fun <get-exactly>() : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/prop/TraitFinalVar.txt b/compiler/testData/loadKotlin/prop/TraitFinalVar.txt
index 1f6c6438067..f59540fd15c 100644
--- a/compiler/testData/loadKotlin/prop/TraitFinalVar.txt
+++ b/compiler/testData/loadKotlin/prop/TraitFinalVar.txt
@@ -2,4 +2,6 @@ package test
 
 internal trait A {
     internal open var v : jet.String
+        internal open fun <get-v>() : jet.String
+        internal open fun <set-v>(/*0*/ value : jet.String) : Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/TraitOpenVal.txt b/compiler/testData/loadKotlin/prop/TraitOpenVal.txt
index 2ac674fed35..52f7047ee3e 100644
--- a/compiler/testData/loadKotlin/prop/TraitOpenVal.txt
+++ b/compiler/testData/loadKotlin/prop/TraitOpenVal.txt
@@ -2,4 +2,5 @@ package test
 
 internal trait A {
     internal open val v : jet.String
+        internal open fun <get-v>() : jet.String
 }
diff --git a/compiler/testData/loadKotlin/prop/VarDelegationToTraitImpl.txt b/compiler/testData/loadKotlin/prop/VarDelegationToTraitImpl.txt
index 117bdca2739..ddc2df589db 100644
--- a/compiler/testData/loadKotlin/prop/VarDelegationToTraitImpl.txt
+++ b/compiler/testData/loadKotlin/prop/VarDelegationToTraitImpl.txt
@@ -2,9 +2,13 @@ package test
 
 internal trait A {
     internal open var v : jet.String
+        internal open fun <get-v>() : jet.String
+        internal open fun <set-v>(/*0*/ value : jet.String) : Unit
 }
 
 internal final class B : test.A {
     /*primary*/ public constructor B()
     internal open override /*1*/ /*fake_override*/ var v : jet.String
+        internal open override /*1*/ /*fake_override*/ fun <get-v>() : jet.String
+        internal open override /*1*/ /*fake_override*/ fun <set-v>(/*0*/ value : jet.String) : Unit
 }
diff --git a/compiler/testData/loadKotlin/visibility/InternalAbstractTraitMembersOverridden.txt b/compiler/testData/loadKotlin/visibility/InternalAbstractTraitMembersOverridden.txt
index 851dc2158bd..8c5fa6dcb9a 100644
--- a/compiler/testData/loadKotlin/visibility/InternalAbstractTraitMembersOverridden.txt
+++ b/compiler/testData/loadKotlin/visibility/InternalAbstractTraitMembersOverridden.txt
@@ -2,13 +2,19 @@ package test
 
 internal trait A {
     public abstract var p : jet.Int
+        public abstract fun <get-p>() : jet.Int
+        public abstract fun <set-p>(/*0*/ <set-?> : jet.Int) : Unit
     internal abstract val v : jet.Int
+        internal abstract fun <get-v>() : jet.Int
     internal abstract fun f() : jet.Int
 }
 
 internal final class B : test.A {
     /*primary*/ public constructor B()
     public open override /*1*/ var p : jet.Int
+        public open override /*1*/ fun <get-p>() : jet.Int
+        public open override /*1*/ fun <set-p>(/*0*/ <set-?> : jet.Int) : Unit
     internal open override /*1*/ val v : jet.Int
+        internal open override /*1*/ fun <get-v>() : jet.Int
     internal open override /*1*/ fun f() : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/visibility/InternalTopLevelMembers.txt b/compiler/testData/loadKotlin/visibility/InternalTopLevelMembers.txt
index cda899a38a1..ece87f7e33e 100644
--- a/compiler/testData/loadKotlin/visibility/InternalTopLevelMembers.txt
+++ b/compiler/testData/loadKotlin/visibility/InternalTopLevelMembers.txt
@@ -1,4 +1,5 @@
 package test
 
 internal val x : jet.Int
+    internal fun <get-x>() : jet.Int
 internal fun f() : jet.Int
diff --git a/compiler/testData/loadKotlin/visibility/InternalTraitMembers.txt b/compiler/testData/loadKotlin/visibility/InternalTraitMembers.txt
index 0b2687a4bc2..538f2ee75cf 100644
--- a/compiler/testData/loadKotlin/visibility/InternalTraitMembers.txt
+++ b/compiler/testData/loadKotlin/visibility/InternalTraitMembers.txt
@@ -2,6 +2,9 @@ package test
 
 internal trait A {
     public abstract var p : jet.Int
+        public abstract fun <get-p>() : jet.Int
+        internal abstract fun <set-p>(/*0*/ <set-?> : jet.Int) : Unit
     internal abstract val v : jet.Int
+        internal abstract fun <get-v>() : jet.Int
     internal abstract fun f() : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/visibility/InternalTraitMembersInherited.txt b/compiler/testData/loadKotlin/visibility/InternalTraitMembersInherited.txt
index 20a1ceff011..e3ad78e16be 100644
--- a/compiler/testData/loadKotlin/visibility/InternalTraitMembersInherited.txt
+++ b/compiler/testData/loadKotlin/visibility/InternalTraitMembersInherited.txt
@@ -2,13 +2,19 @@ package test
 
 internal trait A {
     public open var p : jet.Int
+        public open fun <get-p>() : jet.Int
+        internal open fun <set-p>(/*0*/ value : jet.Int) : Unit
     internal open val v : jet.Int
+        internal open fun <get-v>() : jet.Int
     internal open fun f() : jet.Int
 }
 
 internal final class B : test.A {
     /*primary*/ public constructor B()
     public open override /*1*/ /*fake_override*/ var p : jet.Int
+        public open override /*1*/ /*fake_override*/ fun <get-p>() : jet.Int
+        internal open override /*1*/ /*fake_override*/ fun <set-p>(/*0*/ value : jet.Int) : Unit
     internal open override /*1*/ /*fake_override*/ val v : jet.Int
+        internal open override /*1*/ /*fake_override*/ fun <get-v>() : jet.Int
     internal open override /*1*/ /*fake_override*/ fun f() : jet.Int
 }
diff --git a/compiler/testData/loadKotlin/visibility/PrivateTopLevelVal.txt b/compiler/testData/loadKotlin/visibility/PrivateTopLevelVal.txt
index b6dd6f200a3..a9e810e117c 100644
--- a/compiler/testData/loadKotlin/visibility/PrivateTopLevelVal.txt
+++ b/compiler/testData/loadKotlin/visibility/PrivateTopLevelVal.txt
@@ -1,3 +1,4 @@
 package test
 
 private val topLevelVal : jet.Int
+    private fun <get-topLevelVal>() : jet.Int
diff --git a/compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.txt b/compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.txt
index 12baf0a479d..c8f3f2b00b2 100644
--- a/compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.txt
+++ b/compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.txt
@@ -1,3 +1,5 @@
 package test
 
 internal var topLevelVar : jet.Int
+    internal fun <get-topLevelVar>() : jet.Int
+    private fun <set-topLevelVar>(/*0*/ <set-?> : jet.Int) : Unit