From 9d7d3588366bddde3ec699d976069d3a944c7c28 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Thu, 18 Apr 2019 21:07:26 +0300
Subject: [PATCH] FIR deserializer: support properties

---
 .../KotlinDeserializedJvmSymbolsProvider.kt   |  29 ++-
 .../deserialization/ClassDeserialization.kt   |   4 +-
 .../deserialization/FirMemberDeserializer.kt  |  35 ++++
 .../testData/builtIns/kotlin-collections.txt  |  36 ++++
 .../testData/builtIns/kotlin-ranges.txt       | 102 ++++++++++
 .../fir/resolve/testData/builtIns/kotlin.txt  | 177 ++++++++++++++++++
 .../AnnotationInAnnotationArguments.txt       |  12 ++
 .../annotations/ClassLiteralArguments.txt     |  12 ++
 .../EnumArgumentWithCustomToString.txt        |   6 +
 .../MultiDimensionalArrayMethod.txt           |   6 +
 .../annotations/PrimitiveArrayArguments.txt   |  24 +++
 .../classMembers/ClassObjectPropertyField.txt |   4 +
 .../annotations/classMembers/Constructor.txt  |   3 +
 .../classMembers/DelegatedProperty.txt        |   3 +
 .../annotations/classMembers/EnumArgument.txt |   7 +
 .../annotations/classMembers/EnumEntry.txt    |   6 +
 .../annotations/classMembers/Getter.txt       |   3 +
 ...enConstructorWithInlineClassParameters.txt |   9 +
 .../classMembers/PropertyField.txt            |   4 +
 ...dApiAnnotationOnInlineClassCosntructor.txt |   3 +
 .../annotations/classMembers/Setter.txt       |   4 +
 .../ClassObjectInStaticNestedClass.txt        |   3 +
 .../annotations/classes/DataClass.txt         |   3 +
 .../annotations/classes/EnumArgument.txt      |   3 +
 .../annotations/classes/WithArgument.txt      |  24 +++
 .../classes/WithMultipleArguments.txt         |   9 +
 .../packageMembers/EnumArgument.txt           |   3 +
 .../packageMembers/EnumArrayArgument.txt      |   3 +
 .../packageMembers/StringArrayArgument.txt    |   3 +
 .../annotations/parameters/Constructor.txt    |   3 +
 .../parameters/EnumConstructor.txt            |   6 +
 .../parameters/ExtensionPropertySetter.txt    |   4 +
 .../parameters/InnerClassConstructor.txt      |   9 +
 .../parameters/PropertySetterInClass.txt      |   4 +
 .../propertiesWithoutBackingFields/Class.txt  |   3 +
 .../ClassObject.txt                           |   3 +
 .../ExtensionsWithSameNameClass.txt           |   9 +
 .../NestedTrait.txt                           |   3 +
 .../propertiesWithoutBackingFields/Trait.txt  |   3 +
 .../TraitClassObject.txt                      |   3 +
 .../types/ClassLiteralArgument.txt            |   3 +
 .../types/TypeAnnotationWithArguments.txt     |   6 +
 .../TypeParameterAnnotationWithArguments.txt  |   6 +
 .../withUseSiteTarget/DelegateTarget.txt      |   3 +
 .../withUseSiteTarget/FieldTarget.txt         |   4 +
 .../withUseSiteTarget/PropertyAndAccessor.txt |  18 ++
 .../withUseSiteTarget/ReceiverTarget.txt      |   7 +
 .../class/ClassMemberConflict.txt             |  33 ++++
 .../loadCompiledKotlin/class/NamedObject.txt  |   3 +
 .../class/NamedObjectInClass.txt              |   3 +
 .../class/NamedObjectInClassObject.txt        |   3 +
 .../class/NamedObjectInNamedObject.txt        |   3 +
 ...NamedObjectWithAnotherTopLevelProperty.txt |   3 +
 .../classObject/ClassObjectDeclaresVal.txt    |   3 +
 .../classObject/ClassObjectDeclaresVar.txt    |   4 +
 .../ClassObjectInClassStaticFields.txt        |  25 +++
 .../ClassObjectInTraitStaticFields.txt        |  25 +++
 .../ClassObjectPropertyInClass.txt            |   6 +
 .../ConstructorCollectionParameter.txt        |   3 +
 .../dataClass/MixedComponents.txt             |   7 +
 .../loadCompiledKotlin/dataClass/OneVal.txt   |   3 +
 .../loadCompiledKotlin/dataClass/TwoVals.txt  |   6 +
 .../loadCompiledKotlin/dataClass/TwoVars.txt  |   8 +
 .../enum/EnumWithConstuctor.txt               |   6 +
 .../enum/EnumWithInnerClasses.txt             |   3 +
 .../fromLoadJava/ClassWithConstVal.txt        |   6 +
 .../fromLoadJava/FieldAsVar.txt               |   4 +
 .../fromLoadJava/FieldOfArrayType.txt         |   4 +
 .../fromLoadJava/FinalFieldAsVal.txt          |   3 +
 .../fromLoadJava/TwoFields.txt                |   8 +
 .../kotlinSignature/PropertyArrayTypes.txt    |  12 ++
 .../kotlinSignature/PropertyComplexTypes.txt  |  16 ++
 .../kotlinSignature/PropertySimpleType.txt    |   8 +
 .../error/ExplicitFieldGettersAndSetters.txt  |   4 +
 .../kotlinSignature/error/NoFieldTypeRef.txt  |   4 +
 .../error/SyntaxErrorInFieldAnnotation.txt    |   4 +
 .../error/WrongFieldInitializer.txt           |   4 +
 .../error/WrongFieldMutability.txt            |   7 +
 .../kotlinSignature/error/WrongFieldName.txt  |   4 +
 .../propagation/return/SubclassOfMapEntry.txt |   3 +
 .../modality/ModalityOfFakeOverrides.txt      |   3 +
 .../fromLoadJava/notNull/NotNullField.txt     |   4 +
 .../fun/DeclaredMemberOverridesDelegated.txt  |   3 +
 .../fun/InheritValAndVar.txt                  |  14 ++
 .../fun/InheritValsDifferentTypes.txt         |  12 ++
 .../FunParamReferencesParam.txt               |   1 -
 .../FunParamUpperClassBound.txt               |   1 -
 .../FunParamUpperClassInterfaceBound.txt      |   1 -
 .../FunParamUpperInterfaceBound.txt           |   1 -
 .../fun/nonGeneric/FunDefaultArg.txt          |   1 -
 .../memberOrder/CallablesNameClash.txt        |  12 ++
 .../memberOrder/ExtensionMembers.txt          |  12 ++
 .../ExtensionPropertiesNameClash.txt          |  15 ++
 .../nested/MembersReferenceOuterTP.txt        |   6 +
 .../loadCompiledKotlin/prop/ClassVal.txt      |   3 +
 .../prop/ClassValAbstract.txt                 |   3 +
 .../loadCompiledKotlin/prop/ClassVar.txt      |   4 +
 .../loadCompiledKotlin/prop/Const.txt         |   6 +
 .../loadCompiledKotlin/prop/ExtValInClass.txt |   3 +
 .../prop/ExtValIntListQOfIntInClass.txt       |   3 +
 .../prop/ExtValIntTInClass.txt                |   3 +
 .../prop/ExtValIntTQInClass.txt               |   3 +
 .../prop/ExtValTIntInClass.txt                |   3 +
 .../loadCompiledKotlin/prop/ExtVarInClass.txt |   4 +
 .../prop/ExtVarIntTInClass.txt                |   4 +
 .../prop/ExtVarIntTQInClass.txt               |   4 +
 .../prop/ExtVarTIntInClass.txt                |   4 +
 .../prop/ExtVarTQIntInClass.txt               |   4 +
 .../NonConstValWithConstantValueAttribute.txt |   9 +
 .../prop/OverrideClassVal.txt                 |   6 +
 .../prop/OverrideTraitVal.txt                 |   6 +
 .../prop/PropFromSuperclass.txt               |   3 +
 .../loadCompiledKotlin/prop/TraitFinalVar.txt |   4 +
 .../loadCompiledKotlin/prop/TraitOpenVal.txt  |   3 +
 .../prop/VarDelegationToTraitImpl.txt         |   4 +
 .../prop/VarWithDelegated.txt                 |   4 +
 .../prop/defaultAccessors/ClassVal.txt        |  15 ++
 .../prop/defaultAccessors/ClassValParams.txt  |  15 ++
 .../prop/defaultAccessors/ClassValWithGet.txt |  15 ++
 .../prop/defaultAccessors/ClassVar.txt        |  20 ++
 .../defaultAccessors/ClassVarModality.txt     |  20 ++
 .../prop/defaultAccessors/ClassVarParams.txt  |  20 ++
 .../prop/defaultAccessors/ClassVarWithGet.txt |  20 ++
 .../prop/defaultAccessors/ClassVarWithSet.txt |  36 ++++
 .../type/SuspendFunction.txt                  |   1 -
 .../typealias/Annotations.txt                 |   3 +
 .../visibility/PrivateClassMembers.txt        |  10 +
 .../visibility/PrivateToThis.txt              |  14 ++
 .../visibility/PropertyInConstructor.txt      |  18 ++
 ...ropertyInConstructorExplicitVisibility.txt |  18 ++
 .../resolve/stdlib/reflectionClass.txt        |   2 +-
 131 files changed, 1261 insertions(+), 17 deletions(-)

diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt
index 4361a1b54a3..36bcd910d68 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.fir.scopes.impl.FirClassDeclaredMemberScope
 import org.jetbrains.kotlin.fir.symbols.ConeCallableSymbol
 import org.jetbrains.kotlin.fir.symbols.ConeClassLikeSymbol
 import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
+import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol
 import org.jetbrains.kotlin.load.java.JavaClassFinder
@@ -54,6 +55,10 @@ class KotlinDeserializedJvmSymbolsProvider(
             proto.functionList.withIndex()
                 .groupBy({ context.nameResolver.getName(it.value.name) }) { (index) -> index }
         }
+        val topLevelPropertyNameIndex by lazy {
+            proto.propertyList.withIndex()
+                .groupBy({ context.nameResolver.getName(it.value.name) }) { (index) -> index }
+        }
         val typeAliasNameIndex by lazy {
             proto.typeAliasList.withIndex()
                 .groupBy({ context.nameResolver.getName(it.value.name) }) { (index) -> index }
@@ -139,15 +144,25 @@ class KotlinDeserializedJvmSymbolsProvider(
         }
     }
 
+    private fun loadFunctionsByName(part: PackagePartsCacheData, name: Name): List<FirCallableSymbol> {
+        val functionIds = part.topLevelFunctionNameIndex[name] ?: return emptyList()
+        return functionIds.map { part.proto.getFunction(it) }
+            .map {
+                part.context.memberDeserializer.loadFunction(it).symbol
+            }
+    }
+
+    private fun loadPropertiesByName(part: PackagePartsCacheData, name: Name): List<FirCallableSymbol> {
+        val propertyIds = part.topLevelPropertyNameIndex[name] ?: return emptyList()
+        return propertyIds.map { part.proto.getProperty(it) }
+            .map {
+                part.context.memberDeserializer.loadProperty(it).symbol
+            }
+    }
+
     override fun getTopLevelCallableSymbols(packageFqName: FqName, name: Name): List<ConeCallableSymbol> {
         return getPackageParts(packageFqName).flatMap { part ->
-            val functionIds = part.topLevelFunctionNameIndex[name] ?: return@flatMap emptyList()
-            functionIds.map { part.proto.getFunction(it) }
-                .map {
-                    part.context.memberDeserializer.loadFunction(it).symbol
-                }.filter { callableSymbol ->
-                    callableSymbol.callableId.callableName == name
-                }
+            loadFunctionsByName(part, name) + loadPropertiesByName(part, name)
         }
     }
 
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
index ef818d3bffc..46b90e1900b 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
@@ -9,8 +9,6 @@ import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.impl.FirClassImpl
 import org.jetbrains.kotlin.fir.resolve.transformers.firUnsafe
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
-import org.jetbrains.kotlin.fir.types.impl.ConeClassTypeImpl
-import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl
 import org.jetbrains.kotlin.fir.types.impl.FirResolvedTypeRefImpl
 import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.metadata.deserialization.Flags
@@ -65,7 +63,7 @@ fun deserializeClassToSymbol(
 
         // TODO: properties
         addDeclarations(classProto.functionList.map(classDeserializer::loadFunction))
-
+        addDeclarations(classProto.propertyList.map(classDeserializer::loadProperty))
 
         addDeclarations(
             classProto.constructorList.map {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt
index 23afcfaf812..f739bb23fa6 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.fir.expressions.impl.FirExpressionStub
 import org.jetbrains.kotlin.fir.resolve.transformers.firUnsafe
 import org.jetbrains.kotlin.fir.symbols.CallableId
 import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
+import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
@@ -143,6 +144,40 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
         )
     }
 
+    fun loadProperty(proto: ProtoBuf.Property): FirProperty {
+        val flags = if (proto.hasFlags()) proto.flags else loadOldFlags(proto.oldFlags)
+        val callableName = c.nameResolver.getName(proto.name)
+        val symbol = FirPropertySymbol(CallableId(c.packageFqName, c.relativeClassName, callableName))
+        val local = c.childContext(proto.typeParameterList)
+        val returnTypeRef = local.typeDeserializer.type(proto.returnType(c.typeTable)).toTypeRef()
+
+        val getterFlags = if (proto.hasGetterFlags()) proto.getterFlags else flags
+        val setterFlags = if (proto.hasSetterFlags()) proto.setterFlags else flags
+
+        return FirMemberPropertyImpl(
+            c.session,
+            null,
+            symbol,
+            callableName,
+            ProtoEnumFlags.visibility(Flags.VISIBILITY.get(flags)),
+            ProtoEnumFlags.modality(Flags.MODALITY.get(flags)),
+            Flags.IS_EXPECT_PROPERTY.get(flags),
+            false,
+            false,
+            Flags.IS_CONST.get(flags),
+            Flags.IS_LATEINIT.get(flags),
+            proto.receiverType(c.typeTable)?.let(local.typeDeserializer::type)?.toTypeRef(),
+            returnTypeRef,
+            Flags.IS_VAR.get(flags),
+            null,
+            FirDefaultPropertyGetter(c.session, null, returnTypeRef, ProtoEnumFlags.visibility(Flags.VISIBILITY.get(getterFlags))),
+            FirDefaultPropertySetter(c.session, null, returnTypeRef, ProtoEnumFlags.visibility(Flags.VISIBILITY.get(setterFlags))),
+            null
+        ).apply {
+            typeParameters += local.typeDeserializer.ownTypeParameters.map { it.firUnsafe() }
+        }
+    }
+
     fun loadFunction(proto: ProtoBuf.Function): FirNamedFunction {
         val flags = if (proto.hasFlags()) proto.flags else loadOldFlags(proto.oldFlags)
 
diff --git a/compiler/fir/resolve/testData/builtIns/kotlin-collections.txt b/compiler/fir/resolve/testData/builtIns/kotlin-collections.txt
index c0a53f4aaf7..447afe44615 100644
--- a/compiler/fir/resolve/testData/builtIns/kotlin-collections.txt
+++ b/compiler/fir/resolve/testData/builtIns/kotlin-collections.txt
@@ -34,6 +34,9 @@ public abstract interface Collection<out E> : R|kotlin/collections/Iterable<E>|
 
     public abstract operator fun iterator(): R|kotlin/collections/Iterator<E>|
 
+    public abstract val size: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
 }
 
 public abstract class DoubleIterator : R|kotlin/collections/Iterator<kotlin/Double>| {
@@ -96,6 +99,9 @@ public abstract interface List<out E> : R|kotlin/collections/Collection<E>| {
 
     public abstract fun subList(fromIndex: R|kotlin/Int|, toIndex: R|kotlin/Int|): R|kotlin/collections/List<E>|
 
+    public abstract val size: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
 }
 
 public abstract interface ListIterator<out T> : R|kotlin/collections/Iterator<T>| {
@@ -133,7 +139,25 @@ public abstract interface Map<K, out V> : R|kotlin/Any| {
 
     public abstract fun isEmpty(): R|kotlin/Boolean|
 
+    public abstract val entries: R|kotlin/collections/Set<kotlin/collections/Map.Entry<K, V>>|
+        public get(): R|kotlin/collections/Set<kotlin/collections/Map.Entry<K, V>>|
+
+    public abstract val keys: R|kotlin/collections/Set<K>|
+        public get(): R|kotlin/collections/Set<K>|
+
+    public abstract val size: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public abstract val values: R|kotlin/collections/Collection<V>|
+        public get(): R|kotlin/collections/Collection<V>|
+
     public abstract interface Entry<out K, out V> : R|kotlin/Any| {
+        public abstract val key: R|K|
+            public get(): R|K|
+
+        public abstract val value: R|V|
+            public get(): R|V|
+
     }
 
 }
@@ -218,6 +242,15 @@ public abstract interface MutableMap<K, V> : R|kotlin/collections/Map<K, V>| {
 
     public open fun remove(key: R|K|, value: R|V|): R|kotlin/Boolean|
 
+    public abstract val entries: R|kotlin/collections/MutableSet<kotlin/collections/MutableMap.MutableEntry<K, V>>|
+        public get(): R|kotlin/collections/MutableSet<kotlin/collections/MutableMap.MutableEntry<K, V>>|
+
+    public abstract val keys: R|kotlin/collections/MutableSet<K>|
+        public get(): R|kotlin/collections/MutableSet<K>|
+
+    public abstract val values: R|kotlin/collections/MutableCollection<V>|
+        public get(): R|kotlin/collections/MutableCollection<V>|
+
     public abstract interface MutableEntry<K, V> : R|kotlin/collections/Map.Entry<K, V>| {
         public abstract fun setValue(newValue: R|V|): R|V|
 
@@ -251,6 +284,9 @@ public abstract interface Set<out E> : R|kotlin/collections/Collection<E>| {
 
     public abstract operator fun iterator(): R|kotlin/collections/Iterator<E>|
 
+    public abstract val size: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
 }
 
 public abstract class ShortIterator : R|kotlin/collections/Iterator<kotlin/Short>| {
diff --git a/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt b/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt
index 4dd21f7398c..fe32e46f50d 100644
--- a/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt
+++ b/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt
@@ -9,6 +9,15 @@ public open class CharProgression : R|kotlin/collections/Iterable<kotlin/Char>|
 
     public open fun toString(): R|kotlin/String|
 
+    public final val first: R|kotlin/Char|
+        public get(): R|kotlin/Char|
+
+    public final val last: R|kotlin/Char|
+        public get(): R|kotlin/Char|
+
+    public final val step: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     internal constructor(start: R|kotlin/Char|, endInclusive: R|kotlin/Char|, step: R|kotlin/Int|): R|kotlin/ranges/CharProgression|
 
     public final companion object Companion : R|kotlin/Any| {
@@ -25,6 +34,20 @@ internal final class CharProgressionIterator : R|kotlin/collections/CharIterator
 
     public open fun nextChar(): R|kotlin/Char|
 
+    private final val finalElement: R|kotlin/Int|
+        private get(): R|kotlin/Int|
+
+    private final var hasNext: R|kotlin/Boolean|
+        private get(): R|kotlin/Boolean|
+        private set(value: R|kotlin/Boolean|): kotlin/Unit
+
+    private final var next: R|kotlin/Int|
+        private get(): R|kotlin/Int|
+        private set(value: R|kotlin/Int|): kotlin/Unit
+
+    public final val step: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(first: R|kotlin/Char|, last: R|kotlin/Char|, step: R|kotlin/Int|): R|kotlin/ranges/CharProgressionIterator|
 
 }
@@ -40,9 +63,18 @@ public final class CharRange : R|kotlin/ranges/CharProgression|, R|kotlin/ranges
 
     public open fun toString(): R|kotlin/String|
 
+    public open val endInclusive: R|kotlin/Char|
+        public get(): R|kotlin/Char|
+
+    public open val start: R|kotlin/Char|
+        public get(): R|kotlin/Char|
+
     public constructor(start: R|kotlin/Char|, endInclusive: R|kotlin/Char|): R|kotlin/ranges/CharRange|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final val EMPTY: R|kotlin/ranges/CharRange|
+            public get(): R|kotlin/ranges/CharRange|
+
         private constructor(): R|kotlin/ranges/CharRange.Companion|
 
     }
@@ -54,6 +86,12 @@ public abstract interface ClosedRange<T> : R|kotlin/Any| {
 
     public open fun isEmpty(): R|kotlin/Boolean|
 
+    public abstract val endInclusive: R|T|
+        public get(): R|T|
+
+    public abstract val start: R|T|
+        public get(): R|T|
+
 }
 
 public open class IntProgression : R|kotlin/collections/Iterable<kotlin/Int>| {
@@ -67,6 +105,15 @@ public open class IntProgression : R|kotlin/collections/Iterable<kotlin/Int>| {
 
     public open fun toString(): R|kotlin/String|
 
+    public final val first: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public final val last: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public final val step: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     internal constructor(start: R|kotlin/Int|, endInclusive: R|kotlin/Int|, step: R|kotlin/Int|): R|kotlin/ranges/IntProgression|
 
     public final companion object Companion : R|kotlin/Any| {
@@ -83,6 +130,20 @@ internal final class IntProgressionIterator : R|kotlin/collections/IntIterator|
 
     public open fun nextInt(): R|kotlin/Int|
 
+    private final val finalElement: R|kotlin/Int|
+        private get(): R|kotlin/Int|
+
+    private final var hasNext: R|kotlin/Boolean|
+        private get(): R|kotlin/Boolean|
+        private set(value: R|kotlin/Boolean|): kotlin/Unit
+
+    private final var next: R|kotlin/Int|
+        private get(): R|kotlin/Int|
+        private set(value: R|kotlin/Int|): kotlin/Unit
+
+    public final val step: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(first: R|kotlin/Int|, last: R|kotlin/Int|, step: R|kotlin/Int|): R|kotlin/ranges/IntProgressionIterator|
 
 }
@@ -98,9 +159,18 @@ public final class IntRange : R|kotlin/ranges/IntProgression|, R|kotlin/ranges/C
 
     public open fun toString(): R|kotlin/String|
 
+    public open val endInclusive: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public open val start: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(start: R|kotlin/Int|, endInclusive: R|kotlin/Int|): R|kotlin/ranges/IntRange|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final val EMPTY: R|kotlin/ranges/IntRange|
+            public get(): R|kotlin/ranges/IntRange|
+
         private constructor(): R|kotlin/ranges/IntRange.Companion|
 
     }
@@ -118,6 +188,15 @@ public open class LongProgression : R|kotlin/collections/Iterable<kotlin/Long>|
 
     public open fun toString(): R|kotlin/String|
 
+    public final val first: R|kotlin/Long|
+        public get(): R|kotlin/Long|
+
+    public final val last: R|kotlin/Long|
+        public get(): R|kotlin/Long|
+
+    public final val step: R|kotlin/Long|
+        public get(): R|kotlin/Long|
+
     internal constructor(start: R|kotlin/Long|, endInclusive: R|kotlin/Long|, step: R|kotlin/Long|): R|kotlin/ranges/LongProgression|
 
     public final companion object Companion : R|kotlin/Any| {
@@ -134,6 +213,20 @@ internal final class LongProgressionIterator : R|kotlin/collections/LongIterator
 
     public open fun nextLong(): R|kotlin/Long|
 
+    private final val finalElement: R|kotlin/Long|
+        private get(): R|kotlin/Long|
+
+    private final var hasNext: R|kotlin/Boolean|
+        private get(): R|kotlin/Boolean|
+        private set(value: R|kotlin/Boolean|): kotlin/Unit
+
+    private final var next: R|kotlin/Long|
+        private get(): R|kotlin/Long|
+        private set(value: R|kotlin/Long|): kotlin/Unit
+
+    public final val step: R|kotlin/Long|
+        public get(): R|kotlin/Long|
+
     public constructor(first: R|kotlin/Long|, last: R|kotlin/Long|, step: R|kotlin/Long|): R|kotlin/ranges/LongProgressionIterator|
 
 }
@@ -149,9 +242,18 @@ public final class LongRange : R|kotlin/ranges/LongProgression|, R|kotlin/ranges
 
     public open fun toString(): R|kotlin/String|
 
+    public open val endInclusive: R|kotlin/Long|
+        public get(): R|kotlin/Long|
+
+    public open val start: R|kotlin/Long|
+        public get(): R|kotlin/Long|
+
     public constructor(start: R|kotlin/Long|, endInclusive: R|kotlin/Long|): R|kotlin/ranges/LongRange|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final val EMPTY: R|kotlin/ranges/LongRange|
+            public get(): R|kotlin/ranges/LongRange|
+
         private constructor(): R|kotlin/ranges/LongRange.Companion|
 
     }
diff --git a/compiler/fir/resolve/testData/builtIns/kotlin.txt b/compiler/fir/resolve/testData/builtIns/kotlin.txt
index d3da99e853f..4ecd38adf2a 100644
--- a/compiler/fir/resolve/testData/builtIns/kotlin.txt
+++ b/compiler/fir/resolve/testData/builtIns/kotlin.txt
@@ -49,6 +49,9 @@ public final class Array<T> : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|T|): R|kotlin/Unit|
 
+    public final val size: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor<T>(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, T>|): R|kotlin/Array<T>|
 
 }
@@ -80,6 +83,9 @@ public final class BooleanArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Boolean|): R|kotlin/Unit|
 
+    public final val size: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>|): R|kotlin/BooleanArray|
 
     public constructor(size: R|kotlin/Int|): R|kotlin/BooleanArray|
@@ -204,6 +210,18 @@ public final class Byte : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Byte>| {
     private constructor(): R|kotlin/Byte|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final const val MAX_VALUE: R|kotlin/Byte|
+            public get(): R|kotlin/Byte|
+
+        public final const val MIN_VALUE: R|kotlin/Byte|
+            public get(): R|kotlin/Byte|
+
+        public final const val SIZE_BITS: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
+        public final const val SIZE_BYTES: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
         private constructor(): R|kotlin/Byte.Companion|
 
     }
@@ -217,6 +235,9 @@ public final class ByteArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Byte|): R|kotlin/Unit|
 
+    public final val size: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Byte>|): R|kotlin/ByteArray|
 
     public constructor(size: R|kotlin/Int|): R|kotlin/ByteArray|
@@ -255,6 +276,36 @@ public final class Char : R|kotlin/Comparable<kotlin/Char>| {
     private constructor(): R|kotlin/Char|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final const val MAX_HIGH_SURROGATE: R|kotlin/Char|
+            public get(): R|kotlin/Char|
+
+        public final const val MAX_LOW_SURROGATE: R|kotlin/Char|
+            public get(): R|kotlin/Char|
+
+        public final const val MAX_SURROGATE: R|kotlin/Char|
+            public get(): R|kotlin/Char|
+
+        public final const val MAX_VALUE: R|kotlin/Char|
+            public get(): R|kotlin/Char|
+
+        public final const val MIN_HIGH_SURROGATE: R|kotlin/Char|
+            public get(): R|kotlin/Char|
+
+        public final const val MIN_LOW_SURROGATE: R|kotlin/Char|
+            public get(): R|kotlin/Char|
+
+        public final const val MIN_SURROGATE: R|kotlin/Char|
+            public get(): R|kotlin/Char|
+
+        public final const val MIN_VALUE: R|kotlin/Char|
+            public get(): R|kotlin/Char|
+
+        public final const val SIZE_BITS: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
+        public final const val SIZE_BYTES: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
         private constructor(): R|kotlin/Char.Companion|
 
     }
@@ -268,6 +319,9 @@ public final class CharArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Char|): R|kotlin/Unit|
 
+    public final val size: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Char>|): R|kotlin/CharArray|
 
     public constructor(size: R|kotlin/Int|): R|kotlin/CharArray|
@@ -279,6 +333,9 @@ public abstract interface CharSequence : R|kotlin/Any| {
 
     public abstract fun subSequence(startIndex: R|kotlin/Int|, endIndex: R|kotlin/Int|): R|kotlin/CharSequence|
 
+    public abstract val length: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
 }
 
 public abstract interface Cloneable : R|kotlin/Any| {
@@ -292,6 +349,15 @@ public abstract interface Comparable<in T> : R|kotlin/Any| {
 }
 
 public final annotation class Deprecated : R|kotlin/Annotation| {
+    public final val level: R|kotlin/DeprecationLevel|
+        public get(): R|kotlin/DeprecationLevel|
+
+    public final val message: R|kotlin/String|
+        public get(): R|kotlin/String|
+
+    public final val replaceWith: R|kotlin/ReplaceWith|
+        public get(): R|kotlin/ReplaceWith|
+
     public constructor(message: R|kotlin/String|, replaceWith: R|kotlin/ReplaceWith| = STUB, level: R|kotlin/DeprecationLevel| = STUB): R|kotlin/Deprecated|
 
 }
@@ -411,6 +477,21 @@ public final class Double : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Double>
     private constructor(): R|kotlin/Double|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final val MAX_VALUE: R|kotlin/Double|
+            public get(): R|kotlin/Double|
+
+        public final val MIN_VALUE: R|kotlin/Double|
+            public get(): R|kotlin/Double|
+
+        public final val NEGATIVE_INFINITY: R|kotlin/Double|
+            public get(): R|kotlin/Double|
+
+        public final val NaN: R|kotlin/Double|
+            public get(): R|kotlin/Double|
+
+        public final val POSITIVE_INFINITY: R|kotlin/Double|
+            public get(): R|kotlin/Double|
+
         private constructor(): R|kotlin/Double.Companion|
 
     }
@@ -424,6 +505,9 @@ public final class DoubleArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Double|): R|kotlin/Unit|
 
+    public final val size: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Double>|): R|kotlin/DoubleArray|
 
     public constructor(size: R|kotlin/Int|): R|kotlin/DoubleArray|
@@ -446,6 +530,12 @@ public abstract class Enum<E> : R|kotlin/Comparable<E>| {
 
     public open fun toString(): R|kotlin/String|
 
+    public final val name: R|kotlin/String|
+        public get(): R|kotlin/String|
+
+    public final val ordinal: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor<E>(name: R|kotlin/String|, ordinal: R|kotlin/Int|): R|kotlin/Enum<E>|
 
     public final companion object Companion : R|kotlin/Any| {
@@ -570,6 +660,21 @@ public final class Float : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Float>|
     private constructor(): R|kotlin/Float|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final val MAX_VALUE: R|kotlin/Float|
+            public get(): R|kotlin/Float|
+
+        public final val MIN_VALUE: R|kotlin/Float|
+            public get(): R|kotlin/Float|
+
+        public final val NEGATIVE_INFINITY: R|kotlin/Float|
+            public get(): R|kotlin/Float|
+
+        public final val NaN: R|kotlin/Float|
+            public get(): R|kotlin/Float|
+
+        public final val POSITIVE_INFINITY: R|kotlin/Float|
+            public get(): R|kotlin/Float|
+
         private constructor(): R|kotlin/Float.Companion|
 
     }
@@ -583,6 +688,9 @@ public final class FloatArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Float|): R|kotlin/Unit|
 
+    public final val size: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Float>|): R|kotlin/FloatArray|
 
     public constructor(size: R|kotlin/Int|): R|kotlin/FloatArray|
@@ -724,6 +832,18 @@ public final class Int : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Int>| {
     private constructor(): R|kotlin/Int|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final const val MAX_VALUE: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
+        public final const val MIN_VALUE: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
+        public final const val SIZE_BITS: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
+        public final const val SIZE_BYTES: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
         private constructor(): R|kotlin/Int.Companion|
 
     }
@@ -737,6 +857,9 @@ public final class IntArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Int|): R|kotlin/Unit|
 
+    public final val size: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Int>|): R|kotlin/IntArray|
 
     public constructor(size: R|kotlin/Int|): R|kotlin/IntArray|
@@ -875,6 +998,18 @@ public final class Long : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Long>| {
     private constructor(): R|kotlin/Long|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final const val MAX_VALUE: R|kotlin/Long|
+            public get(): R|kotlin/Long|
+
+        public final const val MIN_VALUE: R|kotlin/Long|
+            public get(): R|kotlin/Long|
+
+        public final const val SIZE_BITS: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
+        public final const val SIZE_BYTES: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
         private constructor(): R|kotlin/Long.Companion|
 
     }
@@ -888,6 +1023,9 @@ public final class LongArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Long|): R|kotlin/Unit|
 
+    public final val size: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Long>|): R|kotlin/LongArray|
 
     public constructor(size: R|kotlin/Int|): R|kotlin/LongArray|
@@ -919,6 +1057,9 @@ public abstract class Number : R|kotlin/Any| {
 }
 
 public final annotation class ParameterName : R|kotlin/Annotation| {
+    public final val name: R|kotlin/String|
+        public get(): R|kotlin/String|
+
     public constructor(name: R|kotlin/String|): R|kotlin/ParameterName|
 
 }
@@ -929,6 +1070,12 @@ public final annotation class PublishedApi : R|kotlin/Annotation| {
 }
 
 public final annotation class ReplaceWith : R|kotlin/Annotation| {
+    public final val expression: R|kotlin/String|
+        public get(): R|kotlin/String|
+
+    public final val imports: R|kotlin/Array<out kotlin/String>|
+        public get(): R|kotlin/Array<out kotlin/String>|
+
     public constructor(expression: R|kotlin/String|, vararg imports: R|kotlin/Array<out kotlin/String>|): R|kotlin/ReplaceWith|
 
 }
@@ -1051,6 +1198,18 @@ public final class Short : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Short>|
     private constructor(): R|kotlin/Short|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final const val MAX_VALUE: R|kotlin/Short|
+            public get(): R|kotlin/Short|
+
+        public final const val MIN_VALUE: R|kotlin/Short|
+            public get(): R|kotlin/Short|
+
+        public final const val SIZE_BITS: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
+        public final const val SIZE_BYTES: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
         private constructor(): R|kotlin/Short.Companion|
 
     }
@@ -1064,6 +1223,9 @@ public final class ShortArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Short|): R|kotlin/Unit|
 
+    public final val size: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Short>|): R|kotlin/ShortArray|
 
     public constructor(size: R|kotlin/Int|): R|kotlin/ShortArray|
@@ -1071,6 +1233,9 @@ public final class ShortArray : R|kotlin/Any| {
 }
 
 public final annotation class SinceKotlin : R|kotlin/Annotation| {
+    public final val version: R|kotlin/String|
+        public get(): R|kotlin/String|
+
     public constructor(version: R|kotlin/String|): R|kotlin/SinceKotlin|
 
 }
@@ -1084,6 +1249,9 @@ public final class String : R|kotlin/Comparable<kotlin/String>|, R|kotlin/CharSe
 
     public open fun subSequence(startIndex: R|kotlin/Int|, endIndex: R|kotlin/Int|): R|kotlin/CharSequence|
 
+    public open val length: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|kotlin/String|
 
     public final companion object Companion : R|kotlin/Any| {
@@ -1094,11 +1262,20 @@ public final class String : R|kotlin/Comparable<kotlin/String>|, R|kotlin/CharSe
 }
 
 public final annotation class Suppress : R|kotlin/Annotation| {
+    public final val names: R|kotlin/Array<out kotlin/String>|
+        public get(): R|kotlin/Array<out kotlin/String>|
+
     public constructor(vararg names: R|kotlin/Array<out kotlin/String>|): R|kotlin/Suppress|
 
 }
 
 public open class Throwable : R|kotlin/Any| {
+    public open val cause: R|kotlin/Throwable|?
+        public get(): R|kotlin/Throwable|?
+
+    public open val message: R|kotlin/String|?
+        public get(): R|kotlin/String|?
+
     public constructor(message: R|kotlin/String|?): R|kotlin/Throwable|
 
     public constructor(cause: R|kotlin/Throwable|?): R|kotlin/Throwable|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt
index 8593e27f120..2a57e998568 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt
@@ -9,16 +9,28 @@ public final enum class E : R|kotlin/Enum<test/E>| {
 }
 
 public final annotation class EnumOption : R|kotlin/Annotation| {
+    public final val option: R|test/E|
+        public get(): R|test/E|
+
     public constructor(option: R|test/E|): R|test/EnumOption|
 
 }
 
 public final annotation class OptionGroups : R|kotlin/Annotation| {
+    public final val o1: R|test/StringOptions|
+        public get(): R|test/StringOptions|
+
+    public final val o2: R|test/EnumOption|
+        public get(): R|test/EnumOption|
+
     public constructor(o1: R|test/StringOptions|, o2: R|test/EnumOption|): R|test/OptionGroups|
 
 }
 
 public final annotation class StringOptions : R|kotlin/Annotation| {
+    public final val option: R|kotlin/Array<out kotlin/String>|
+        public get(): R|kotlin/Array<out kotlin/String>|
+
     public constructor(vararg option: R|kotlin/Array<out kotlin/String>|): R|test/StringOptions|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/ClassLiteralArguments.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/ClassLiteralArguments.txt
index 6d9ad87c6ac..9c6639706df 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/ClassLiteralArguments.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/ClassLiteralArguments.txt
@@ -1,4 +1,16 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public final val d2arKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/DoubleArray>>|
+        public get(): R|kotlin/reflect/KClass<kotlin/Array<kotlin/DoubleArray>>|
+
+    public final val klass: R|kotlin/reflect/KClass<*>|
+        public get(): R|kotlin/reflect/KClass<*>|
+
+    public final val klasses: R|kotlin/Array<kotlin/reflect/KClass<*>>|
+        public get(): R|kotlin/Array<kotlin/reflect/KClass<*>>|
+
+    public final val sarKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/String>>|
+        public get(): R|kotlin/reflect/KClass<kotlin/Array<kotlin/String>>|
+
     public constructor(klass: R|kotlin/reflect/KClass<*>|, klasses: R|kotlin/Array<kotlin/reflect/KClass<*>>|, sarKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/String>>|, d2arKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/DoubleArray>>|): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt
index eaba70c63e1..9e173ad0b5c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt
@@ -4,6 +4,9 @@ public final enum class E : R|kotlin/Enum<test/E>| {
 }
 
 public final annotation class EnumAnno : R|kotlin/Annotation| {
+    public final val value: R|test/E|
+        public get(): R|test/E|
+
     public constructor(value: R|test/E|): R|test/EnumAnno|
 
 }
@@ -16,6 +19,9 @@ public final class EnumArgumentWithCustomToString : R|kotlin/Any| {
 }
 
 public final annotation class EnumArrayAnno : R|kotlin/Annotation| {
+    public final val value: R|kotlin/Array<out test/E>|
+        public get(): R|kotlin/Array<out test/E>|
+
     public constructor(vararg value: R|kotlin/Array<out test/E>|): R|test/EnumArrayAnno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/MultiDimensionalArrayMethod.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/MultiDimensionalArrayMethod.txt
index 12cefc2662f..6ce56472857 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/MultiDimensionalArrayMethod.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/MultiDimensionalArrayMethod.txt
@@ -1,4 +1,7 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public final val s: R|kotlin/String|
+        public get(): R|kotlin/String|
+
     public constructor(s: R|kotlin/String|): R|test/Anno|
 
 }
@@ -6,4 +9,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
 public abstract interface T : R|kotlin/Any| {
     public abstract fun foo(): R|kotlin/Array<kotlin/Array<kotlin/Array<test/T>>>|
 
+    public abstract val bar: R|kotlin/Array<kotlin/Array<kotlin/BooleanArray>>|
+        public get(): R|kotlin/Array<kotlin/Array<kotlin/BooleanArray>>|
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/PrimitiveArrayArguments.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/PrimitiveArrayArguments.txt
index a3a1aaaa54e..7ded757d895 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/PrimitiveArrayArguments.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/PrimitiveArrayArguments.txt
@@ -1,4 +1,28 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public final val booleans: R|kotlin/BooleanArray|
+        public get(): R|kotlin/BooleanArray|
+
+    public final val bytes: R|kotlin/ByteArray|
+        public get(): R|kotlin/ByteArray|
+
+    public final val chars: R|kotlin/CharArray|
+        public get(): R|kotlin/CharArray|
+
+    public final val doubles: R|kotlin/DoubleArray|
+        public get(): R|kotlin/DoubleArray|
+
+    public final val floats: R|kotlin/FloatArray|
+        public get(): R|kotlin/FloatArray|
+
+    public final val ints: R|kotlin/IntArray|
+        public get(): R|kotlin/IntArray|
+
+    public final val longs: R|kotlin/LongArray|
+        public get(): R|kotlin/LongArray|
+
+    public final val shorts: R|kotlin/ShortArray|
+        public get(): R|kotlin/ShortArray|
+
     public constructor(bytes: R|kotlin/ByteArray|, shorts: R|kotlin/ShortArray|, ints: R|kotlin/IntArray|, longs: R|kotlin/LongArray|, chars: R|kotlin/CharArray|, floats: R|kotlin/FloatArray|, doubles: R|kotlin/DoubleArray|, booleans: R|kotlin/BooleanArray|): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
index d1e8c135f26..0806b90e50d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
@@ -7,6 +7,10 @@ public final class Class : R|kotlin/Any| {
     public constructor(): R|test/Class|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final var property: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+            public set(value: R|kotlin/Int|): kotlin/Unit
+
         private constructor(): R|test/Class.Companion|
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Constructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Constructor.txt
index 2870e2543dd..08fac34a63c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Constructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Constructor.txt
@@ -1,4 +1,7 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public final val value: R|kotlin/String|
+        public get(): R|kotlin/String|
+
     public constructor(value: R|kotlin/String|): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/DelegatedProperty.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/DelegatedProperty.txt
index 1587fee8aa3..ea64c7952b4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/DelegatedProperty.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/DelegatedProperty.txt
@@ -4,6 +4,9 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
+    public final val x: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt
index 788c5256ccd..19dc8205563 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt
@@ -1,4 +1,7 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public final val t: R|java/lang/annotation/ElementType|
+        public get(): R|java/lang/annotation/ElementType|
+
     public constructor(t: R|java/lang/annotation/ElementType|): R|test/Anno|
 
 }
@@ -6,6 +9,10 @@ public final annotation class Anno : R|kotlin/Annotation| {
 public final class Class : R|kotlin/Any| {
     public final fun foo(): R|kotlin/Unit|
 
+    public final var bar: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
     public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumEntry.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumEntry.txt
index 47a45308ea6..555392e675a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumEntry.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumEntry.txt
@@ -1,4 +1,10 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public final val value: R|kotlin/String|
+        public get(): R|kotlin/String|
+
+    public final val x: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(value: R|kotlin/String| = STUB, x: R|kotlin/Int| = STUB): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Getter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Getter.txt
index 1587fee8aa3..0334697cca1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Getter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Getter.txt
@@ -4,6 +4,9 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
+    public final val property: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt
index 988402b2605..98b1e9802b9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt
@@ -4,6 +4,9 @@ public final annotation class Ann : R|kotlin/Annotation| {
 }
 
 public sealed class Sealed : R|kotlin/Any| {
+    public final val z: R|test/Z|
+        public get(): R|test/Z|
+
     private constructor(z: R|test/Z|): R|test/Sealed|
 
     public final class Derived : R|test/Sealed| {
@@ -14,6 +17,9 @@ public sealed class Sealed : R|kotlin/Any| {
 }
 
 public final class Test : R|kotlin/Any| {
+    public final val z: R|test/Z|
+        public get(): R|test/Z|
+
     public constructor(z: R|test/Z|, a: R|kotlin/Int|): R|test/Test|
 
     private constructor(z: R|test/Z|, s: R|kotlin/String|): R|test/Test|
@@ -29,6 +35,9 @@ public final inline class Z : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
+    public final val x: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(x: R|kotlin/Int|): R|test/Z|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt
index 1587fee8aa3..9e5c6401bf8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt
@@ -4,6 +4,10 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
+    public final var property: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
     public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt
index ea880a1352a..fa9347e7665 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt
@@ -5,6 +5,9 @@ public final inline class Z : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
+    public final val value: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     internal constructor(value: R|kotlin/Int|): R|test/Z|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt
index 1587fee8aa3..9e5c6401bf8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt
@@ -4,6 +4,10 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
+    public final var property: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
     public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt
index 4c1cdb53c17..4076b7159d2 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt
@@ -5,6 +5,9 @@ public final class A : R|kotlin/Any| {
         public constructor(): R|test/A.B|
 
         public final companion object Companion : R|kotlin/Any| {
+            public final val TEST: R|kotlin/Int|
+                public get(): R|kotlin/Int|
+
             private constructor(): R|test/A.B.Companion|
 
         }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DataClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DataClass.txt
index 12e7fa53126..f23b7952e41 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DataClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DataClass.txt
@@ -9,6 +9,9 @@ public final data class My : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
+    public final val x: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(x: R|kotlin/Int|): R|test/My|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt
index 26c6ed7cc72..fcaad6fe7e5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt
@@ -1,4 +1,7 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public final val t: R|java/lang/annotation/ElementType|
+        public get(): R|java/lang/annotation/ElementType|
+
     public constructor(t: R|java/lang/annotation/ElementType|): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithArgument.txt
index f4833edbb69..e37c2eb467b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithArgument.txt
@@ -1,14 +1,23 @@
 public final annotation class BooleanAnno : R|kotlin/Annotation| {
+    public final val value: R|kotlin/Boolean|
+        public get(): R|kotlin/Boolean|
+
     public constructor(value: R|kotlin/Boolean|): R|test/BooleanAnno|
 
 }
 
 public final annotation class ByteAnno : R|kotlin/Annotation| {
+    public final val value: R|kotlin/Byte|
+        public get(): R|kotlin/Byte|
+
     public constructor(value: R|kotlin/Byte|): R|test/ByteAnno|
 
 }
 
 public final annotation class CharAnno : R|kotlin/Annotation| {
+    public final val value: R|kotlin/Char|
+        public get(): R|kotlin/Char|
+
     public constructor(value: R|kotlin/Char|): R|test/CharAnno|
 
 }
@@ -19,26 +28,41 @@ public final class Class : R|kotlin/Any| {
 }
 
 public final annotation class DoubleAnno : R|kotlin/Annotation| {
+    public final val value: R|kotlin/Double|
+        public get(): R|kotlin/Double|
+
     public constructor(value: R|kotlin/Double|): R|test/DoubleAnno|
 
 }
 
 public final annotation class FloatAnno : R|kotlin/Annotation| {
+    public final val value: R|kotlin/Float|
+        public get(): R|kotlin/Float|
+
     public constructor(value: R|kotlin/Float|): R|test/FloatAnno|
 
 }
 
 public final annotation class IntAnno : R|kotlin/Annotation| {
+    public final val value: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(value: R|kotlin/Int|): R|test/IntAnno|
 
 }
 
 public final annotation class LongAnno : R|kotlin/Annotation| {
+    public final val value: R|kotlin/Long|
+        public get(): R|kotlin/Long|
+
     public constructor(value: R|kotlin/Long|): R|test/LongAnno|
 
 }
 
 public final annotation class ShortAnno : R|kotlin/Annotation| {
+    public final val value: R|kotlin/Short|
+        public get(): R|kotlin/Short|
+
     public constructor(value: R|kotlin/Short|): R|test/ShortAnno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithMultipleArguments.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithMultipleArguments.txt
index 9b3536865c2..70f8fdfefa1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithMultipleArguments.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithMultipleArguments.txt
@@ -1,4 +1,13 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public final val double: R|kotlin/Double|
+        public get(): R|kotlin/Double|
+
+    public final val int: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public final val string: R|kotlin/String|
+        public get(): R|kotlin/String|
+
     public constructor(int: R|kotlin/Int|, string: R|kotlin/String|, double: R|kotlin/Double|): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArgument.txt
index 411cb2060af..9cdb69dbdf8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArgument.txt
@@ -1,6 +1,9 @@
 public final fun foo(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
+    public final val t: R|java/lang/annotation/ElementType|
+        public get(): R|java/lang/annotation/ElementType|
+
     public constructor(t: R|java/lang/annotation/ElementType|): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArrayArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArrayArgument.txt
index 925f0fae089..63a245ce5d8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArrayArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArrayArgument.txt
@@ -3,6 +3,9 @@ public final fun baz(): R|kotlin/Unit|
 public final fun foo(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
+    public final val t: R|kotlin/Array<out java/lang/annotation/ElementType>|
+        public get(): R|kotlin/Array<out java/lang/annotation/ElementType>|
+
     public constructor(vararg t: R|kotlin/Array<out java/lang/annotation/ElementType>|): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/StringArrayArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/StringArrayArgument.txt
index 849195bc081..0fc95adf14a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/StringArrayArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/StringArrayArgument.txt
@@ -3,6 +3,9 @@ public final fun baz(): R|kotlin/Unit|
 public final fun foo(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
+    public final val t: R|kotlin/Array<out kotlin/String>|
+        public get(): R|kotlin/Array<out kotlin/String>|
+
     public constructor(vararg t: R|kotlin/Array<out kotlin/String>|): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/Constructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/Constructor.txt
index 1f1ea90102f..d15303da7cd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/Constructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/Constructor.txt
@@ -9,6 +9,9 @@ public final annotation class B : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
+    public final val x: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(x: R|kotlin/Int|, y: R|kotlin/String|): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/EnumConstructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/EnumConstructor.txt
index a22bf8874c6..fa635f49a7c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/EnumConstructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/EnumConstructor.txt
@@ -9,6 +9,12 @@ public final annotation class B : R|kotlin/Annotation| {
 }
 
 public final enum class E : R|kotlin/Enum<test/E>| {
+    public final val x: R|kotlin/String|
+        public get(): R|kotlin/String|
+
+    public final val y: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     private constructor(x: R|kotlin/String|, y: R|kotlin/Int|): R|test/E|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt
index 75243064807..cf8f76cb6b5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt
@@ -4,6 +4,10 @@ public final annotation class A : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
+    public final var R|kotlin/Int|.foo: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
     public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt
index eacb781f87e..9f906adf040 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt
@@ -1,4 +1,7 @@
 public final annotation class A : R|kotlin/Annotation| {
+    public final val s: R|kotlin/String|
+        public get(): R|kotlin/String|
+
     public constructor(s: R|kotlin/String|): R|test/A|
 
 }
@@ -7,11 +10,17 @@ public final class Outer : R|kotlin/Any| {
     public constructor(): R|test/Outer|
 
     public final inner class Inner : R|kotlin/Any| {
+        public final val y: R|kotlin/String|
+            public get(): R|kotlin/String|
+
         public constructor(y: R|kotlin/String|): R|test/Outer.Inner|
 
     }
 
     public final class Nested : R|kotlin/Any| {
+        public final val x: R|kotlin/String|
+            public get(): R|kotlin/String|
+
         public constructor(x: R|kotlin/String|): R|test/Outer.Nested|
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt
index 75243064807..201c9a4b651 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt
@@ -4,6 +4,10 @@ public final annotation class A : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
+    public final var foo: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
     public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt
index 1587fee8aa3..0334697cca1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt
@@ -4,6 +4,9 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
+    public final val property: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt
index d1e8c135f26..a9cba737c07 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt
@@ -7,6 +7,9 @@ public final class Class : R|kotlin/Any| {
     public constructor(): R|test/Class|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final val property: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
         private constructor(): R|test/Class.Companion|
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt
index baf0e5ef288..ca4daed6772 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt
@@ -1,4 +1,13 @@
 public final class Class : R|kotlin/Any| {
+    public final val R|kotlin/Double|.extension: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public final val R|kotlin/Int|.extension: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public final val R|kotlin/String|.extension: R|kotlin/String|
+        public get(): R|kotlin/String|
+
     public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt
index 526ce9cae92..e7aa815be03 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt
@@ -7,6 +7,9 @@ public final class Class : R|kotlin/Any| {
     public constructor(): R|test/Class|
 
     public abstract interface Trait : R|kotlin/Any| {
+        public abstract val property: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt
index 535e56b3a5b..c45e763d696 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt
@@ -4,4 +4,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public abstract interface Trait : R|kotlin/Any| {
+    public abstract val property: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt
index 39ab94b1f75..ed563ef43bc 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt
@@ -5,6 +5,9 @@ public final annotation class Anno : R|kotlin/Annotation| {
 
 public abstract interface Trait : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
+        public final val property: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
         private constructor(): R|test/Trait.Companion|
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt
index ab3e65863ef..69f5b7cdabe 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt
@@ -12,6 +12,9 @@ public final class A : R|kotlin/Any| {
 }
 
 public final annotation class Ann : R|kotlin/Annotation| {
+    public final val klass: R|kotlin/reflect/KClass<*>|
+        public get(): R|kotlin/reflect/KClass<*>|
+
     public constructor(klass: R|kotlin/reflect/KClass<*>|): R|test/Ann|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeAnnotationWithArguments.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeAnnotationWithArguments.txt
index 631c48e0777..1dc157e3f96 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeAnnotationWithArguments.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeAnnotationWithArguments.txt
@@ -1,4 +1,10 @@
 public final annotation class Ann : R|kotlin/Annotation| {
+    public final val x: R|kotlin/String|
+        public get(): R|kotlin/String|
+
+    public final val y: R|kotlin/Double|
+        public get(): R|kotlin/Double|
+
     public constructor(x: R|kotlin/String|, y: R|kotlin/Double|): R|test/Ann|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt
index 3d65f232fd1..ce97c42b7aa 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt
@@ -1,4 +1,10 @@
 public final annotation class A : R|kotlin/Annotation| {
+    public final val x: R|kotlin/String|
+        public get(): R|kotlin/String|
+
+    public final val y: R|kotlin/Double|
+        public get(): R|kotlin/Double|
+
     public constructor(x: R|kotlin/String|, y: R|kotlin/Double|): R|test/A|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt
index ef69c24a5c7..039cc27cdba 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt
@@ -4,6 +4,9 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
+    public final val property: R|kotlin/String|
+        public get(): R|kotlin/String|
+
     public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt
index 1587fee8aa3..9e5c6401bf8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt
@@ -4,6 +4,10 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
+    public final var property: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
     public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.txt
index a63fca7660f..65ad9643ec3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.txt
@@ -1,12 +1,30 @@
 public final annotation class A : R|kotlin/Annotation| {
+    public final val value: R|kotlin/String|
+        public get(): R|kotlin/String|
+
     public constructor(value: R|kotlin/String|): R|test/A|
 
 }
 
 public final annotation class B : R|kotlin/Annotation| {
+    public final val value: R|kotlin/Array<kotlin/String>|
+        public get(): R|kotlin/Array<kotlin/String>|
+
     public constructor(value: R|kotlin/Array<kotlin/String>|): R|test/B|
 
 }
 
 public abstract interface I : R|kotlin/Any| {
+    public abstract var getterAndSetter: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
+    public abstract var propertyAndGetter: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
+    public abstract var propertyAndSetter: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt
index 4be9a9aaae4..e0f1c309f20 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt
@@ -1,6 +1,13 @@
 public final class A : R|kotlin/Any| {
     public final fun R|kotlin/String|.myLength(q: R|kotlin/String|): R|kotlin/Int|
 
+    public final val R|kotlin/String|.myLength2: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public final var R|kotlin/String|.myLength3: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
     public constructor(): R|test/A|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassMemberConflict.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassMemberConflict.txt
index b89d354e350..7157ad4fc12 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassMemberConflict.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassMemberConflict.txt
@@ -1,7 +1,13 @@
 public final class ConstructorTypeParamClassObjectConflict<test> : R|kotlin/Any| {
+    public final val some: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor<test>(): R|test/ConstructorTypeParamClassObjectConflict<test>|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final val test: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
         private constructor(): R|test/ConstructorTypeParamClassObjectConflict.Companion|
 
     }
@@ -9,6 +15,9 @@ public final class ConstructorTypeParamClassObjectConflict<test> : R|kotlin/Any|
 }
 
 public final class ConstructorTypeParamClassObjectTypeConflict<test> : R|kotlin/Any| {
+    public final val some: R|test|
+        public get(): R|test|
+
     public constructor<test>(): R|test/ConstructorTypeParamClassObjectTypeConflict<test>|
 
     public final companion object Companion : R|kotlin/Any| {
@@ -22,9 +31,18 @@ public final class ConstructorTypeParamClassObjectTypeConflict<test> : R|kotlin/
 }
 
 public final class TestClassObjectAndClassConflict : R|kotlin/Any| {
+    public final val bla: R|kotlin/String|
+        public get(): R|kotlin/String|
+
+    public final val some: R|kotlin/String|
+        public get(): R|kotlin/String|
+
     public constructor(): R|test/TestClassObjectAndClassConflict|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final val bla: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
         private constructor(): R|test/TestClassObjectAndClassConflict.Companion|
 
     }
@@ -32,9 +50,15 @@ public final class TestClassObjectAndClassConflict : R|kotlin/Any| {
 }
 
 public final class TestConstructorParamClassObjectConflict : R|kotlin/Any| {
+    public final val some: R|kotlin/String|
+        public get(): R|kotlin/String|
+
     public constructor(test: R|kotlin/String|): R|test/TestConstructorParamClassObjectConflict|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final val test: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
         private constructor(): R|test/TestConstructorParamClassObjectConflict.Companion|
 
     }
@@ -42,9 +66,18 @@ public final class TestConstructorParamClassObjectConflict : R|kotlin/Any| {
 }
 
 public final class TestConstructorValClassObjectConflict : R|kotlin/Any| {
+    public final val some: R|kotlin/String|
+        public get(): R|kotlin/String|
+
+    public final val test: R|kotlin/String|
+        public get(): R|kotlin/String|
+
     public constructor(test: R|kotlin/String|): R|test/TestConstructorValClassObjectConflict|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final val test: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
         private constructor(): R|test/TestConstructorValClassObjectConflict.Companion|
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObject.txt
index 940fb06befc..f1f5fb60682 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObject.txt
@@ -1,6 +1,9 @@
 public final object Obj : R|kotlin/Any| {
     public final fun f(): R|kotlin/String|
 
+    public final val v: R|kotlin/String|
+        public get(): R|kotlin/String|
+
     private constructor(): R|test/Obj|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClass.txt
index 586c3bcfe1b..30fbe3dbd18 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClass.txt
@@ -4,6 +4,9 @@ public final class Outer : R|kotlin/Any| {
     public final object Obj : R|kotlin/Any| {
         public final fun f(): R|kotlin/String|
 
+        public final val v: R|kotlin/String|
+            public get(): R|kotlin/String|
+
         private constructor(): R|test/Outer.Obj|
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClassObject.txt
index 4acb9d791b9..309e18f566b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClassObject.txt
@@ -7,6 +7,9 @@ public final class Outer : R|kotlin/Any| {
         public final object Obj : R|kotlin/Any| {
             public final fun f(): R|kotlin/String|
 
+            public final val v: R|kotlin/String|
+                public get(): R|kotlin/String|
+
             private constructor(): R|test/Outer.Companion.Obj|
 
         }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInNamedObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInNamedObject.txt
index 3fa3e4db515..ed421f7f547 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInNamedObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInNamedObject.txt
@@ -4,6 +4,9 @@ public final object Outer : R|kotlin/Any| {
     public final object Obj : R|kotlin/Any| {
         public final fun f(): R|kotlin/String|
 
+        public final val v: R|kotlin/String|
+            public get(): R|kotlin/String|
+
         private constructor(): R|test/Outer.Obj|
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
index 940fb06befc..f1f5fb60682 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
@@ -1,6 +1,9 @@
 public final object Obj : R|kotlin/Any| {
     public final fun f(): R|kotlin/String|
 
+    public final val v: R|kotlin/String|
+        public get(): R|kotlin/String|
+
     private constructor(): R|test/Obj|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVal.txt
index c22f8cc6f24..de1d9de6a77 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVal.txt
@@ -2,6 +2,9 @@ public final class ClassObjectDeclaresProperty : R|kotlin/Any| {
     public constructor(): R|test/ClassObjectDeclaresProperty|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final val i: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
         private constructor(): R|test/ClassObjectDeclaresProperty.Companion|
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt
index c22f8cc6f24..41f3177ac24 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt
@@ -2,6 +2,10 @@ public final class ClassObjectDeclaresProperty : R|kotlin/Any| {
     public constructor(): R|test/ClassObjectDeclaresProperty|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final var s: R|kotlin/String|
+            public get(): R|kotlin/String|
+            public set(value: R|kotlin/String|): kotlin/Unit
+
         private constructor(): R|test/ClassObjectDeclaresProperty.Companion|
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt
index 31374147a5a..8c52f6c7bb9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt
@@ -4,6 +4,31 @@ public final class Test : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
         public final fun incProp4(): R|kotlin/Unit|
 
+        public final const val constProp8: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
+        public final val prop1: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
+        public final var prop2: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+            protected set(value: R|kotlin/Int|): kotlin/Unit
+
+        public final val prop3: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
+        public final var prop4: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+            public set(value: R|kotlin/Int|): kotlin/Unit
+
+        public final var prop5: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+            public set(value: R|kotlin/Int|): kotlin/Unit
+
+        public final var prop7: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+            public set(value: R|kotlin/Int|): kotlin/Unit
+
         private constructor(): R|test/Test.Companion|
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInTraitStaticFields.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInTraitStaticFields.txt
index 83debe26071..a058161d743 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInTraitStaticFields.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInTraitStaticFields.txt
@@ -2,6 +2,31 @@ public abstract interface Test : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
         public final fun incProp4(): R|kotlin/Unit|
 
+        public final const val constProp8: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
+        public final val prop1: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
+        public final var prop2: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+            protected set(value: R|kotlin/Int|): kotlin/Unit
+
+        public final val prop3: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
+        public final var prop4: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+            public set(value: R|kotlin/Int|): kotlin/Unit
+
+        public final var prop5: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+            public set(value: R|kotlin/Int|): kotlin/Unit
+
+        public final var prop7: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+            public set(value: R|kotlin/Int|): kotlin/Unit
+
         private constructor(): R|test/Test.Companion|
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt
index f22feb98a19..78031a1e65a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt
@@ -1,7 +1,13 @@
 public final class A : R|kotlin/Any| {
+    public final val other: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|test/A|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final val some: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
         private constructor(): R|test/A.Companion|
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorCollectionParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorCollectionParameter.txt
index fd7346aa2d1..586292f2e43 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorCollectionParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorCollectionParameter.txt
@@ -1,4 +1,7 @@
 public final class TestingKotlinCollections : R|kotlin/Any| {
+    public final val arguments: R|kotlin/collections/Collection<kotlin/String>|
+        public get(): R|kotlin/collections/Collection<kotlin/String>|
+
     public constructor(arguments: R|kotlin/collections/Collection<kotlin/String>|): R|test/TestingKotlinCollections|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt
index 34a8422fbe6..dd4f809700f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt
@@ -11,6 +11,13 @@ public final data class DataClass : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
+    public final var x: R|kotlin/String|
+        public get(): R|kotlin/String|
+        public set(value: R|kotlin/String|): kotlin/Unit
+
+    public final val z: R|kotlin/Double|
+        public get(): R|kotlin/Double|
+
     public constructor(x: R|kotlin/String|, z: R|kotlin/Double|): R|test/DataClass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/OneVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/OneVal.txt
index 1d46509af8a..39d36a30c5d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/OneVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/OneVal.txt
@@ -9,6 +9,9 @@ public final data class DataClass : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
+    public final val x: R|kotlin/String|
+        public get(): R|kotlin/String|
+
     public constructor(x: R|kotlin/String|): R|test/DataClass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVals.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVals.txt
index 4f17f11690f..1ebe715c76e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVals.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVals.txt
@@ -11,6 +11,12 @@ public final data class DataClass : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
+    public final val x: R|kotlin/String|
+        public get(): R|kotlin/String|
+
+    public final val y: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(x: R|kotlin/String|, y: R|kotlin/Int|): R|test/DataClass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt
index 4f17f11690f..19f75c187d6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt
@@ -11,6 +11,14 @@ public final data class DataClass : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
+    public final var x: R|kotlin/String|
+        public get(): R|kotlin/String|
+        public set(value: R|kotlin/String|): kotlin/Unit
+
+    public final var y: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
     public constructor(x: R|kotlin/String|, y: R|kotlin/Int|): R|test/DataClass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithConstuctor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithConstuctor.txt
index e2356cda7e2..c11a98d5678 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithConstuctor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithConstuctor.txt
@@ -1,4 +1,10 @@
 public final enum class En : R|kotlin/Enum<test/En>| {
+    public final val b: R|kotlin/Boolean|
+        public get(): R|kotlin/Boolean|
+
+    public final val i: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     private constructor(b: R|kotlin/Boolean| = STUB, i: R|kotlin/Int| = STUB): R|test/En|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithInnerClasses.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithInnerClasses.txt
index d7c0af46a03..bda0d871886 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithInnerClasses.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithInnerClasses.txt
@@ -1,6 +1,9 @@
 public final enum class Enum : R|kotlin/Enum<test/Enum>| {
     public final fun f(): R|kotlin/Int|
 
+    public final val c: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     private constructor(): R|test/Enum|
 
     public final inner class Inner : R|kotlin/Any| {
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithConstVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithConstVal.txt
index 060474a26a3..43a29cccf98 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithConstVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithConstVal.txt
@@ -1,4 +1,10 @@
 public final class ClassWithConstVal : R|kotlin/Any| {
+    public final val f: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public final val f2: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|test/ClassWithConstVal|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldAsVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldAsVar.txt
index b6b5c39fec2..d8e0472a5ba 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldAsVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldAsVar.txt
@@ -1,4 +1,8 @@
 public final class FieldAsVar : R|kotlin/Any| {
+    public final var f: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
     public constructor(): R|test/FieldAsVar|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt
index a0f6c68a689..e81c2f1dc6b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt
@@ -1,4 +1,8 @@
 public open class FieldOfArrayType : R|kotlin/Any| {
+    public final var files: R|kotlin/Array<java/io/File>|?
+        public get(): R|kotlin/Array<java/io/File>|?
+        public set(value: R|kotlin/Array<java/io/File>|?): kotlin/Unit
+
     public constructor(): R|test/FieldOfArrayType|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FinalFieldAsVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FinalFieldAsVal.txt
index 0def93f10da..4a1555a9f7a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FinalFieldAsVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FinalFieldAsVal.txt
@@ -1,4 +1,7 @@
 public final class FinalFieldAsVal : R|kotlin/Any| {
+    public final val f: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|test/FinalFieldAsVal|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/TwoFields.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/TwoFields.txt
index c59fda6fad1..32488c73545 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/TwoFields.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/TwoFields.txt
@@ -1,4 +1,12 @@
 public final class TwoFields : R|kotlin/Any| {
+    public final var a: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
+    public final var b: R|kotlin/Short|
+        public get(): R|kotlin/Short|
+        public set(value: R|kotlin/Short|): kotlin/Unit
+
     public constructor(): R|test/TwoFields|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt
index 207858a3109..e4564575059 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt
@@ -1,4 +1,16 @@
 public open class PropertyArrayTypes<T> : R|kotlin/Any| {
+    public final var array: R|kotlin/Array<kotlin/String>|
+        public get(): R|kotlin/Array<kotlin/String>|
+        public set(value: R|kotlin/Array<kotlin/String>|): kotlin/Unit
+
+    public final var arrayOfArrays: R|kotlin/Array<kotlin/Array<kotlin/String>>|
+        public get(): R|kotlin/Array<kotlin/Array<kotlin/String>>|
+        public set(value: R|kotlin/Array<kotlin/Array<kotlin/String>>|): kotlin/Unit
+
+    public final var genericArray: R|kotlin/Array<T>|
+        public get(): R|kotlin/Array<T>|
+        public set(value: R|kotlin/Array<T>|): kotlin/Unit
+
     public constructor<T>(): R|test/PropertyArrayTypes<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt
index c2d346e8b32..da65917da28 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt
@@ -1,4 +1,20 @@
 public open class PropertyComplexTypes<T> : R|kotlin/Any| {
+    public final var genericType: R|T|
+        public get(): R|T|
+        public set(value: R|T|): kotlin/Unit
+
+    public final var listDefinedGeneric: R|java/util/ArrayList<kotlin/String>|
+        public get(): R|java/util/ArrayList<kotlin/String>|
+        public set(value: R|java/util/ArrayList<kotlin/String>|): kotlin/Unit
+
+    public final var listGeneric: R|java/util/ArrayList<T>|
+        public get(): R|java/util/ArrayList<T>|
+        public set(value: R|java/util/ArrayList<T>|): kotlin/Unit
+
+    public final var listOfGenericList: R|java/util/ArrayList<java/util/ArrayList<T>>|
+        public get(): R|java/util/ArrayList<java/util/ArrayList<T>>|
+        public set(value: R|java/util/ArrayList<java/util/ArrayList<T>>|): kotlin/Unit
+
     public constructor<T>(): R|test/PropertyComplexTypes<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt
index 7668595c961..ff40f128fab 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt
@@ -1,4 +1,12 @@
 public open class PropertySimpleType : R|kotlin/Any| {
+    public final var fieldOne: R|kotlin/String|
+        public get(): R|kotlin/String|
+        public set(value: R|kotlin/String|): kotlin/Unit
+
+    public final var fieldTwo: R|kotlin/String|?
+        public get(): R|kotlin/String|?
+        public set(value: R|kotlin/String|?): kotlin/Unit
+
     public constructor(): R|test/PropertySimpleType|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
index 316d9cc4ed9..ab3a10dc44c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
@@ -1,4 +1,8 @@
 public open class ExplicitFieldGettersAndSetters : R|kotlin/Any| {
+    public final var foo: R|kotlin/String|?
+        public get(): R|kotlin/String|?
+        public set(value: R|kotlin/String|?): kotlin/Unit
+
     public constructor(): R|test/ExplicitFieldGettersAndSetters|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt
index 42d50e1585e..6ceee75d3f8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt
@@ -1,4 +1,8 @@
 public open class NoFieldTypeRef : R|kotlin/Any| {
+    public final var foo: R|kotlin/String|?
+        public get(): R|kotlin/String|?
+        public set(value: R|kotlin/String|?): kotlin/Unit
+
     public constructor(): R|test/NoFieldTypeRef|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
index 374dd90977e..4f7e695a6ab 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
@@ -1,4 +1,8 @@
 public open class SyntaxErrorInFieldAnnotation : R|kotlin/Any| {
+    public final var foo: R|kotlin/String|?
+        public get(): R|kotlin/String|?
+        public set(value: R|kotlin/String|?): kotlin/Unit
+
     public constructor(): R|test/SyntaxErrorInFieldAnnotation|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt
index 8191e05dc03..b3ab756a425 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt
@@ -1,4 +1,8 @@
 public open class WrongFieldInitializer : R|kotlin/Any| {
+    public final var foo: R|kotlin/String|?
+        public get(): R|kotlin/String|?
+        public set(value: R|kotlin/String|?): kotlin/Unit
+
     public constructor(): R|test/WrongFieldInitializer|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt
index 134a5cb7cec..d193fc8c63b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt
@@ -1,4 +1,11 @@
 public open class WrongFieldMutability : R|kotlin/Any| {
+    public final val fooFinal: R|kotlin/String|?
+        public get(): R|kotlin/String|?
+
+    public final var fooNotFinal: R|kotlin/String|?
+        public get(): R|kotlin/String|?
+        public set(value: R|kotlin/String|?): kotlin/Unit
+
     public constructor(): R|test/WrongFieldMutability|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt
index 81c267f5a44..d1c5075bcb6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt
@@ -1,4 +1,8 @@
 public open class WrongFieldName : R|kotlin/Any| {
+    public final var foo: R|kotlin/String|?
+        public get(): R|kotlin/String|?
+        public set(value: R|kotlin/String|?): kotlin/Unit
+
     public constructor(): R|test/WrongFieldName|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
index a3e3e045b34..a7c71b276eb 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
@@ -1,4 +1,7 @@
 public abstract interface SubclassOfMapEntry<K, V> : R|kotlin/collections/MutableMap.MutableEntry<K, V>| {
     public abstract fun setValue(value: R|V|): R|V|
 
+    public abstract val value: R|V|
+        public get(): R|V|
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt
index a35a5fa0491..f61e64d930b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt
@@ -1,6 +1,9 @@
 public open class ModalityOfFakeOverrides : R|java/util/AbstractList<kotlin/String>| {
     public open operator fun get(index: R|kotlin/Int|): R|kotlin/String|
 
+    public open val size: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|test/ModalityOfFakeOverrides|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullField.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullField.txt
index 1b470ecbe15..1219a841687 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullField.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullField.txt
@@ -1,4 +1,8 @@
 public open class NotNullField : R|kotlin/Any| {
+    public final var hi: R|kotlin/String|
+        public get(): R|kotlin/String|
+        public set(value: R|kotlin/String|): kotlin/Unit
+
     public constructor(): R|test/NotNullField|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/DeclaredMemberOverridesDelegated.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/DeclaredMemberOverridesDelegated.txt
index 3b6aadee5b1..65b42b6083f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/DeclaredMemberOverridesDelegated.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/DeclaredMemberOverridesDelegated.txt
@@ -1,6 +1,9 @@
 public final class B : R|test/X|, R|test/Y| {
     public open fun foo(): R|kotlin/Unit|
 
+    public final val a: R|test/X|
+        public get(): R|test/X|
+
     public constructor(a: R|test/X|): R|test/B|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InheritValAndVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InheritValAndVar.txt
index f069337b12b..df08afbf004 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InheritValAndVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InheritValAndVar.txt
@@ -2,7 +2,21 @@ public abstract interface Sub : R|test/Super1|, R|test/Super2| {
 }
 
 public abstract interface Super1 : R|kotlin/Any| {
+    public abstract val x: R|kotlin/String|
+        public get(): R|kotlin/String|
+
+    public abstract var y: R|kotlin/String|
+        public get(): R|kotlin/String|
+        public set(value: R|kotlin/String|): kotlin/Unit
+
 }
 
 public abstract interface Super2 : R|kotlin/Any| {
+    public abstract var x: R|kotlin/String|
+        public get(): R|kotlin/String|
+        public set(value: R|kotlin/String|): kotlin/Unit
+
+    public abstract val y: R|kotlin/String|
+        public get(): R|kotlin/String|
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InheritValsDifferentTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InheritValsDifferentTypes.txt
index f069337b12b..19b5de5e3c6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InheritValsDifferentTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InheritValsDifferentTypes.txt
@@ -2,7 +2,19 @@ public abstract interface Sub : R|test/Super1|, R|test/Super2| {
 }
 
 public abstract interface Super1 : R|kotlin/Any| {
+    public abstract val x: R|kotlin/String|
+        public get(): R|kotlin/String|
+
+    public abstract val y: R|kotlin/CharSequence|
+        public get(): R|kotlin/CharSequence|
+
 }
 
 public abstract interface Super2 : R|kotlin/Any| {
+    public abstract val x: R|kotlin/CharSequence|
+        public get(): R|kotlin/CharSequence|
+
+    public abstract val y: R|kotlin/String|
+        public get(): R|kotlin/String|
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt
index c398b0f2773..e89b39965d8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt
@@ -1,2 +1 @@
 public final fun <P, Q : R|P|> funParamReferencesParam(): R|kotlin/Int|
-
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
index 8bcc172bfde..a30e86853a4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
@@ -1,2 +1 @@
 public final fun <A : R|java/lang/Number|> uno(): R|kotlin/Int|
-
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
index 6d795460861..f39d41b21af 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
@@ -1,2 +1 @@
 public final fun <A : R|java/lang/Number|, R|java/io/Serializable|> tres(): R|kotlin/Int|
-
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
index 31aae2f2732..74d34c7539b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
@@ -1,2 +1 @@
 public final fun <A : R|java/io/Serializable|> dos(): R|kotlin/Int|
-
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/FunDefaultArg.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/FunDefaultArg.txt
index 83ec24a746e..02470c779bc 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/FunDefaultArg.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/FunDefaultArg.txt
@@ -1,2 +1 @@
 public final fun funDefaultArg(p: R|kotlin/Int|, q: R|kotlin/Int| = STUB, r: R|kotlin/Int| = STUB): R|kotlin/Int|
-
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/CallablesNameClash.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/CallablesNameClash.txt
index 61fe1be979a..cf9f96c5b95 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/CallablesNameClash.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/CallablesNameClash.txt
@@ -1,9 +1,15 @@
 public final fun a(): R|kotlin/Int|
 
+public final val a: R|kotlin/Int|
+    public get(): R|kotlin/Int|
+
 public final fun b(): R|kotlin/Int|
 
 public final fun c(): R|kotlin/Int|
 
+public final val c: R|kotlin/Int|
+    public get(): R|kotlin/Int|
+
 public final class A : R|kotlin/Any| {
     public final fun a(): R|kotlin/Int|
 
@@ -11,6 +17,12 @@ public final class A : R|kotlin/Any| {
 
     public final fun c(): R|kotlin/Int|
 
+    public final val a: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public final val c: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|test/A|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionMembers.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionMembers.txt
index c8631227017..e738ee3a2fe 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionMembers.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionMembers.txt
@@ -17,6 +17,18 @@ public final class A : R|kotlin/Any| {
 
     public final fun R|kotlin/String|.f3(): R|kotlin/Unit|
 
+    public final val c: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public final val d: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public final val R|kotlin/Int|.c: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public final val R|kotlin/Int|.d: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|test/A|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionPropertiesNameClash.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionPropertiesNameClash.txt
index c83a10b891b..75d8c5f1b97 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionPropertiesNameClash.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionPropertiesNameClash.txt
@@ -1,4 +1,19 @@
 public final class A : R|kotlin/Any| {
+    public final val a: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public final val c: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public final val R|kotlin/Int|.a: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public final val R|kotlin/Int|.b: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public final val R|kotlin/Int|.c: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|test/A|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt
index f6bff0421ef..3e043df36dc 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt
@@ -6,6 +6,12 @@ public final class MembersReferenceOuterTP<P> : R|kotlin/Any| {
 
         public final fun g(p: R|P|): R|P|
 
+        public final val v: R|P|
+            public get(): R|P|
+
+        public final val <Q : R|P|> R|Q|.w: R|Q|
+            public get(): R|Q|
+
         public constructor(): R|test/MembersReferenceOuterTP.Inner|
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVal.txt
index b3bf539fcb4..edc0daaf745 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVal.txt
@@ -1,4 +1,7 @@
 public final class ClassVal : R|kotlin/Any| {
+    public final val aa: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|test/ClassVal|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassValAbstract.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassValAbstract.txt
index 2cfb3f337e3..e61722b2f2b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassValAbstract.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassValAbstract.txt
@@ -1,4 +1,7 @@
 public abstract class ClassValAbstract : R|kotlin/Any| {
+    public abstract val a: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|test/ClassValAbstract|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVar.txt
index b413c17cc50..49e5b57088d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVar.txt
@@ -1,4 +1,8 @@
 public final class ClassVar : R|kotlin/Any| {
+    public final var aa: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
     public constructor(): R|test/ClassVar|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/Const.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/Const.txt
index 7a9e5ecdb7a..2bc64f33e50 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/Const.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/Const.txt
@@ -1,4 +1,7 @@
 public final object A : R|kotlin/Any| {
+    internal final const val inObject: R|kotlin/Int|
+        internal get(): R|kotlin/Int|
+
     private constructor(): R|test/A|
 
 }
@@ -7,6 +10,9 @@ public final class B : R|kotlin/Any| {
     public constructor(): R|test/B|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final const val inCompanion: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
         private constructor(): R|test/B.Companion|
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValInClass.txt
index cff35371974..0a13b0e84ef 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValInClass.txt
@@ -1,4 +1,7 @@
 public final class ExtPropInClass : R|kotlin/Any| {
+    public final val R|kotlin/Int|.itIs: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|test/ExtPropInClass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntListQOfIntInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntListQOfIntInClass.txt
index 62d327e5d0c..9044731e70f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntListQOfIntInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntListQOfIntInClass.txt
@@ -1,4 +1,7 @@
 public final class ExtValInClass : R|kotlin/Any| {
+    public final val R|kotlin/Int|.asas: R|java/util/List<kotlin/Int>|?
+        public get(): R|java/util/List<kotlin/Int>|?
+
     public constructor(): R|test/ExtValInClass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTInClass.txt
index 3794ed901fe..80b0c46a569 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTInClass.txt
@@ -1,4 +1,7 @@
 public final class ExtValInClass<T> : R|kotlin/Any| {
+    public final val R|kotlin/Int|.asas: R|T|
+        public get(): R|T|
+
     public constructor<T>(): R|test/ExtValInClass<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTQInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTQInClass.txt
index 3b6faea5b29..7998749f48d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTQInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTQInClass.txt
@@ -1,4 +1,7 @@
 public final class ExtValInClass<P> : R|kotlin/Any| {
+    public final val R|kotlin/Int|.asas: R|P|
+        public get(): R|P|
+
     public constructor<P>(): R|test/ExtValInClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValTIntInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValTIntInClass.txt
index df55b39c5e5..fcf53bf7a84 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValTIntInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValTIntInClass.txt
@@ -1,4 +1,7 @@
 public final class ExtValPIntInClass<P> : R|kotlin/Any| {
+    public final val R|P|.asas: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor<P>(): R|test/ExtValPIntInClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarInClass.txt
index cff35371974..8789b1cb3b6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarInClass.txt
@@ -1,4 +1,8 @@
 public final class ExtPropInClass : R|kotlin/Any| {
+    public final var R|kotlin/Int|.itIs: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
     public constructor(): R|test/ExtPropInClass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt
index 3b6faea5b29..d98794df222 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt
@@ -1,4 +1,8 @@
 public final class ExtValInClass<P> : R|kotlin/Any| {
+    public final var R|kotlin/Int|.asas: R|P|
+        public get(): R|P|
+        public set(value: R|P|): kotlin/Unit
+
     public constructor<P>(): R|test/ExtValInClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt
index 3b6faea5b29..d98794df222 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt
@@ -1,4 +1,8 @@
 public final class ExtValInClass<P> : R|kotlin/Any| {
+    public final var R|kotlin/Int|.asas: R|P|
+        public get(): R|P|
+        public set(value: R|P|): kotlin/Unit
+
     public constructor<P>(): R|test/ExtValInClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt
index df55b39c5e5..6010cc4f22a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt
@@ -1,4 +1,8 @@
 public final class ExtValPIntInClass<P> : R|kotlin/Any| {
+    public final var R|P|.asas: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
     public constructor<P>(): R|test/ExtValPIntInClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt
index df55b39c5e5..6010cc4f22a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt
@@ -1,4 +1,8 @@
 public final class ExtValPIntInClass<P> : R|kotlin/Any| {
+    public final var R|P|.asas: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
     public constructor<P>(): R|test/ExtValPIntInClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt
index 97b3e6ccdfd..86606fb77e9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt
@@ -1,7 +1,13 @@
 public final class C : R|kotlin/Any| {
+    public final val nonConstVal2: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|test/C|
 
     public final companion object Companion : R|kotlin/Any| {
+        public final val nonConstVal3: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
         private constructor(): R|test/C.Companion|
 
     }
@@ -10,6 +16,9 @@ public final class C : R|kotlin/Any| {
 
 public abstract interface I : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
+        public final val nonConstVal4: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
         private constructor(): R|test/I.Companion|
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideClassVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideClassVal.txt
index 776d87bab69..57c2fbcb78e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideClassVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideClassVal.txt
@@ -1,9 +1,15 @@
 public open class BaseClass : R|kotlin/Any| {
+    public open val shape: R|kotlin/String|
+        public get(): R|kotlin/String|
+
     public constructor(): R|test/BaseClass|
 
 }
 
 public open class Subclass : R|test/BaseClass| {
+    public open val shape: R|kotlin/String|
+        public get(): R|kotlin/String|
+
     public constructor(): R|test/Subclass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideTraitVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideTraitVal.txt
index fbb30f8e102..d501638b179 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideTraitVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideTraitVal.txt
@@ -1,7 +1,13 @@
 public open class Subclass : R|test/Trait| {
+    public open val shape: R|kotlin/String|
+        public get(): R|kotlin/String|
+
     public constructor(): R|test/Subclass|
 
 }
 
 public abstract interface Trait : R|kotlin/Any| {
+    public abstract val shape: R|kotlin/String|
+        public get(): R|kotlin/String|
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/PropFromSuperclass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/PropFromSuperclass.txt
index e363bab3d01..8e94721f129 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/PropFromSuperclass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/PropFromSuperclass.txt
@@ -1,4 +1,7 @@
 public open class BaseClass : R|kotlin/Any| {
+    public final val exactly: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|test/BaseClass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/TraitFinalVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/TraitFinalVar.txt
index 451d87e5b1e..da36a3abed5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/TraitFinalVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/TraitFinalVar.txt
@@ -1,2 +1,6 @@
 public abstract interface A : R|kotlin/Any| {
+    public open var v: R|kotlin/String|
+        public get(): R|kotlin/String|
+        public set(value: R|kotlin/String|): kotlin/Unit
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/TraitOpenVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/TraitOpenVal.txt
index 451d87e5b1e..ce8e88c520c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/TraitOpenVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/TraitOpenVal.txt
@@ -1,2 +1,5 @@
 public abstract interface A : R|kotlin/Any| {
+    public open val v: R|kotlin/String|
+        public get(): R|kotlin/String|
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarDelegationToTraitImpl.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarDelegationToTraitImpl.txt
index f4420900c9a..26f4c5c03b1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarDelegationToTraitImpl.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarDelegationToTraitImpl.txt
@@ -1,4 +1,8 @@
 public abstract interface A : R|kotlin/Any| {
+    public open var v: R|kotlin/String|
+        public get(): R|kotlin/String|
+        public set(value: R|kotlin/String|): kotlin/Unit
+
 }
 
 public final class B : R|test/A| {
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt
index ece2a1ea362..b42632ad4a9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt
@@ -1,4 +1,8 @@
 public final class A : R|kotlin/Any| {
+    public final var a: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
     public constructor(): R|test/A|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVal.txt
index b3bf539fcb4..de4c671d655 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVal.txt
@@ -1,4 +1,19 @@
 public final class ClassVal : R|kotlin/Any| {
+    public final val property1: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    internal final val property2: R|kotlin/Int|
+        internal get(): R|kotlin/Int|
+
+    private final val property3: R|java/lang/Object|
+        private get(): R|java/lang/Object|
+
+    protected final val property4: R|kotlin/String|
+        protected get(): R|kotlin/String|
+
+    public final val property5: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|test/ClassVal|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValParams.txt
index 71236edf1d9..a665a867dda 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValParams.txt
@@ -1,4 +1,19 @@
 public final class ClassValParams : R|kotlin/Any| {
+    public final val pr1: R|kotlin/String|
+        public get(): R|kotlin/String|
+
+    internal final val pr2: R|kotlin/Int|
+        internal get(): R|kotlin/Int|
+
+    private final val pr3: R|kotlin/Long|
+        private get(): R|kotlin/Long|
+
+    protected final val pr4: R|java/util/Date|
+        protected get(): R|java/util/Date|
+
+    public final val pr5: R|kotlin/Any|
+        public get(): R|kotlin/Any|
+
     public constructor(pr1: R|kotlin/String|, pr2: R|kotlin/Int|, pr3: R|kotlin/Long|, pr4: R|java/util/Date|, pr5: R|kotlin/Any|, pr6: R|java/lang/Object|): R|test/ClassValParams|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValWithGet.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValWithGet.txt
index b3bf539fcb4..de4c671d655 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValWithGet.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValWithGet.txt
@@ -1,4 +1,19 @@
 public final class ClassVal : R|kotlin/Any| {
+    public final val property1: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    internal final val property2: R|kotlin/Int|
+        internal get(): R|kotlin/Int|
+
+    private final val property3: R|java/lang/Object|
+        private get(): R|java/lang/Object|
+
+    protected final val property4: R|kotlin/String|
+        protected get(): R|kotlin/String|
+
+    public final val property5: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|test/ClassVal|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVar.txt
index b413c17cc50..d8fd0c1da5e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVar.txt
@@ -1,4 +1,24 @@
 public final class ClassVar : R|kotlin/Any| {
+    public final var property1: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
+    internal final var property2: R|kotlin/Int|
+        internal get(): R|kotlin/Int|
+        internal set(value: R|kotlin/Int|): kotlin/Unit
+
+    private final var property3: R|java/lang/Object|
+        private get(): R|java/lang/Object|
+        private set(value: R|java/lang/Object|): kotlin/Unit
+
+    protected final var property4: R|kotlin/String|
+        protected get(): R|kotlin/String|
+        protected set(value: R|kotlin/String|): kotlin/Unit
+
+    public final var property5: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
     public constructor(): R|test/ClassVar|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarModality.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarModality.txt
index 02fe7080a3b..ffd9bb8028e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarModality.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarModality.txt
@@ -1,9 +1,29 @@
 public open class ClassVarModality : R|kotlin/Any| {
+    public open var property1: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
+    internal final var property2: R|kotlin/Int|
+        internal get(): R|kotlin/Int|
+        internal set(value: R|kotlin/Int|): kotlin/Unit
+
+    public open var property3: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
+    internal final var property4: R|kotlin/Int|
+        internal get(): R|kotlin/Int|
+        private set(value: R|kotlin/Int|): kotlin/Unit
+
     public constructor(): R|test/ClassVarModality|
 
 }
 
 public abstract class ClassVarModalityAbstract : R|kotlin/Any| {
+    public abstract var property1: R|java/util/Date|
+        public get(): R|java/util/Date|
+        public set(value: R|java/util/Date|): kotlin/Unit
+
     public constructor(): R|test/ClassVarModalityAbstract|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarParams.txt
index 3bec71e93f4..dc9f204ec83 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarParams.txt
@@ -1,4 +1,24 @@
 public final class ClassVarParams : R|kotlin/Any| {
+    public final var pr1: R|kotlin/String|
+        public get(): R|kotlin/String|
+        public set(value: R|kotlin/String|): kotlin/Unit
+
+    internal final var pr2: R|kotlin/Int|
+        internal get(): R|kotlin/Int|
+        internal set(value: R|kotlin/Int|): kotlin/Unit
+
+    private final var pr3: R|kotlin/Long|
+        private get(): R|kotlin/Long|
+        private set(value: R|kotlin/Long|): kotlin/Unit
+
+    protected final var pr4: R|java/util/Date|
+        protected get(): R|java/util/Date|
+        protected set(value: R|java/util/Date|): kotlin/Unit
+
+    public final var pr5: R|kotlin/Any|
+        public get(): R|kotlin/Any|
+        public set(value: R|kotlin/Any|): kotlin/Unit
+
     public constructor(pr1: R|kotlin/String|, pr2: R|kotlin/Int|, pr3: R|kotlin/Long|, pr4: R|java/util/Date|, pr5: R|kotlin/Any|, pr6: R|java/lang/Object|): R|test/ClassVarParams|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt
index b3bf539fcb4..4a6adb730ea 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt
@@ -1,4 +1,24 @@
 public final class ClassVal : R|kotlin/Any| {
+    public final var property1: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
+    internal final var property2: R|kotlin/Int|
+        internal get(): R|kotlin/Int|
+        internal set(value: R|kotlin/Int|): kotlin/Unit
+
+    private final var property3: R|java/lang/Object|
+        private get(): R|java/lang/Object|
+        private set(value: R|java/lang/Object|): kotlin/Unit
+
+    protected final var property4: R|kotlin/String|
+        protected get(): R|kotlin/String|
+        protected set(value: R|kotlin/String|): kotlin/Unit
+
+    public final var property5: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
     public constructor(): R|test/ClassVal|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt
index b3bf539fcb4..2bbcb26fe62 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt
@@ -1,4 +1,40 @@
 public final class ClassVal : R|kotlin/Any| {
+    public final var property1: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
+    public final var property10: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        protected set(value: R|kotlin/Int|): kotlin/Unit
+
+    public final var property11: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        internal set(value: R|kotlin/Int|): kotlin/Unit
+
+    public final var property2: R|java/lang/Object|
+        public get(): R|java/lang/Object|
+        protected set(value: R|java/lang/Object|): kotlin/Unit
+
+    public final var property3: R|java/lang/Object|
+        public get(): R|java/lang/Object|
+        private set(value: R|java/lang/Object|): kotlin/Unit
+
+    protected final var property4: R|kotlin/String|
+        protected get(): R|kotlin/String|
+        protected set(value: R|kotlin/String|): kotlin/Unit
+
+    protected final var property5: R|kotlin/String|
+        protected get(): R|kotlin/String|
+        private set(value: R|kotlin/String|): kotlin/Unit
+
+    public final var property8: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        public set(value: R|kotlin/Int|): kotlin/Unit
+
+    public final var property9: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+        private set(value: R|kotlin/Int|): kotlin/Unit
+
     public constructor(): R|test/ClassVal|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/SuspendFunction.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/SuspendFunction.txt
index e3e80e9170f..9757c2f1505 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/SuspendFunction.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/SuspendFunction.txt
@@ -5,4 +5,3 @@ public final fun test2(): R|class error: createSuspendFunctionType not supported
 public final fun test3(): R|kotlin/collections/List<class error: createSuspendFunctionType not supported>|
 
 public final fun test4(): R|class error: createSuspendFunctionType not supported|
-
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/Annotations.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/Annotations.txt
index 0ea668b375a..84a9ec9a552 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/Annotations.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/Annotations.txt
@@ -1,4 +1,7 @@
 public final annotation class Ann : R|kotlin/Annotation| {
+    public final val value: R|kotlin/String|
+        public get(): R|kotlin/String|
+
     public constructor(value: R|kotlin/String| = STUB): R|test/Ann|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClassMembers.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClassMembers.txt
index fa9e0d8326c..741ff7d1047 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClassMembers.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClassMembers.txt
@@ -1,6 +1,16 @@
 public final class PrivateClassMembers : R|kotlin/Any| {
     private final fun f(): R|kotlin/Int|
 
+    internal final val internal: R|kotlin/Int|
+        internal get(): R|kotlin/Int|
+
+    private final var r: R|kotlin/Int|
+        private get(): R|kotlin/Int|
+        private set(value: R|kotlin/Int|): kotlin/Unit
+
+    private final val v: R|kotlin/Int|
+        private get(): R|kotlin/Int|
+
     public constructor(): R|test/PrivateClassMembers|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt
index fee75f8e17d..6857efe8f4b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt
@@ -1,6 +1,20 @@
 public final class A<in I> : R|kotlin/Any| {
     private/*private to this*/ final fun bas(): R|I|
 
+    private/*private to this*/ final var bar: R|I|
+        private/*private to this*/ get(): R|I|
+        private/*private to this*/ set(value: R|I|): kotlin/Unit
+
+    private/*private to this*/ final val foo: R|I|
+        private/*private to this*/ get(): R|I|
+
+    private/*private to this*/ final val val_with_accessors: R|I|
+        private/*private to this*/ get(): R|I|
+
+    private/*private to this*/ final var var_with_accessors: R|I|
+        private/*private to this*/ get(): R|I|
+        private/*private to this*/ set(value: R|I|): kotlin/Unit
+
     public constructor<I>(): R|test/A<I>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructor.txt
index 9002d892598..b759b23541a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructor.txt
@@ -1,9 +1,27 @@
 public open class Base : R|kotlin/Any| {
+    internal open val int: R|kotlin/Int|
+        internal get(): R|kotlin/Int|
+
+    protected open val prot: R|kotlin/Int|
+        protected get(): R|kotlin/Int|
+
+    public open val pub: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|test/Base|
 
 }
 
 public final class Child : R|test/Base| {
+    internal open val int: R|kotlin/Int|
+        internal get(): R|kotlin/Int|
+
+    protected open val prot: R|kotlin/Int|
+        protected get(): R|kotlin/Int|
+
+    public open val pub: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(prot: R|kotlin/Int|, int: R|kotlin/Int|, pub: R|kotlin/Int|): R|test/Child|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructorExplicitVisibility.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructorExplicitVisibility.txt
index 9002d892598..08e071a56eb 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructorExplicitVisibility.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructorExplicitVisibility.txt
@@ -1,9 +1,27 @@
 public open class Base : R|kotlin/Any| {
+    internal open val int: R|kotlin/Int|
+        internal get(): R|kotlin/Int|
+
+    protected open val prot: R|kotlin/Int|
+        protected get(): R|kotlin/Int|
+
+    public open val pub: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(): R|test/Base|
 
 }
 
 public final class Child : R|test/Base| {
+    public open val int: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public open val prot: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public open val pub: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public constructor(prot: R|kotlin/Int|, int: R|kotlin/Int|, pub: R|kotlin/Int|): R|test/Child|
 
 }
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.txt b/compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.txt
index ee7faeb6753..8d3ffcd1fb4 100644
--- a/compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.txt
+++ b/compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.txt
@@ -1,5 +1,5 @@
 FILE: reflectionClass.kt
-    public final val javaClass: R|java/lang/Class<kotlin/String>| = <getClass>(R|kotlin/String|).<Unresolved name: java>#
+    public final val javaClass: R|java/lang/Class<kotlin/String>| = <getClass>(R|kotlin/String|).R|kotlin/jvm/java|
         public get(): R|java/lang/Class<kotlin/String>|
     public final val kotlinClass: R|kotlin/reflect/KClass<kotlin/String>| = <getClass>(R|kotlin/String|)
         public get(): R|kotlin/reflect/KClass<kotlin/String>|