AA/LC: Support annotation property->backing field move

#KT-57462 Fixed

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescDefaultBackingFieldSymbol.kt

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased
+
+import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
+import org.jetbrains.kotlin.analysis.api.annotations.KtAnnotationsList
+import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext
+import org.jetbrains.kotlin.analysis.api.descriptors.annotations.KtFe10AnnotationsList
+import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer
+import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10PsiDefaultBackingFieldSymbolPointer
+import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken
+import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion
+import org.jetbrains.kotlin.analysis.api.symbols.KtBackingFieldSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KtKotlinPropertySymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySymbol
+import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
+import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
+import org.jetbrains.kotlin.analysis.api.types.KtType
+import org.jetbrains.kotlin.descriptors.FieldDescriptor
+import org.jetbrains.kotlin.descriptors.annotations.Annotations
+
+internal class KtFe10DescDefaultBackingFieldSymbol(
+    private val fieldDescriptor: FieldDescriptor?,
+    override val owningProperty: KtKotlinPropertySymbol,
+    val analysisContext: Fe10AnalysisContext
+) : KtBackingFieldSymbol() {
+    context(KtAnalysisSession) override fun createPointer(): KtSymbolPointer<KtBackingFieldSymbol> = withValidityAssertion {
+        KtPsiBasedSymbolPointer.createForSymbolFromSource<KtPropertySymbol>(owningProperty)
+            ?.let { KtFe10PsiDefaultBackingFieldSymbolPointer(it) }
+            ?: KtFe10NeverRestoringSymbolPointer()
+    }
+
+    override val returnType: KtType
+        get() = withValidityAssertion { owningProperty.returnType }
+
+    override val token: KtLifetimeToken
+        get() = owningProperty.token
+
+    override val annotationsList: KtAnnotationsList
+        get() = withValidityAssertion {
+            KtFe10AnnotationsList.create(fieldDescriptor?.annotations ?: Annotations.EMPTY, analysisContext)
+        }
+}

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescKotlinPropertySymbol.kt

@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointe
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
 import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.descriptors.ConstructorDescriptor
+import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.Name
@@ -87,6 +88,12 @@ internal class KtFe10DescKotlinPropertySymbol(
             return KtFe10DescPropertySetterSymbol(setter, analysisContext)
         }
 
+    override val backingFieldSymbol: KtBackingFieldSymbol?
+        get() = withValidityAssertion {
+            if (descriptor.containingDeclaration is FunctionDescriptor) null
+            else KtFe10DescDefaultBackingFieldSymbol(descriptor.backingField, this, analysisContext)
+        }
+
     override val returnType: KtType
         get() = withValidityAssertion { descriptor.type.toKtType(analysisContext) }
 

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticFieldSymbol.kt

@@ -46,7 +46,7 @@ internal class KtFe10DescSyntheticFieldSymbol(
         get() = withValidityAssertion { descriptor.propertyDescriptor.type.toKtType(analysisContext) }
 
     context(KtAnalysisSession)
-    override fun createPointer(): KtSymbolPointer<KtVariableLikeSymbol> = withValidityAssertion {
+    override fun createPointer(): KtSymbolPointer<KtBackingFieldSymbol> = withValidityAssertion {
         val accessorPsi = descriptor.containingDeclaration.toSourceElement.getPsi()
         if (accessorPsi is KtPropertyAccessor) {
             val accessorPointer = KtPsiBasedSymbolPointer.createForSymbolFromPsi<KtPropertyAccessorSymbol>(accessorPsi)

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbol.kt

@@ -75,6 +75,9 @@ internal class KtFe10DescSyntheticJavaPropertySymbol(
             KtFe10DescPropertySetterSymbol(setter, analysisContext)
         }
 
+    override val backingFieldSymbol: KtBackingFieldSymbol?
+        get() = withValidityAssertion { null }
+
     override val initializer: KtInitializerValue?
         get() = withValidityAssertion { createKtInitializerValue(source as? KtProperty, descriptor, analysisContext) }
 

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbolForOverride.kt

@@ -75,6 +75,9 @@ internal class KtFe10DescSyntheticJavaPropertySymbolForOverride(
             KtFe10DescPropertySetterSymbol(setter, analysisContext)
         }
 
+    override val backingFieldSymbol: KtBackingFieldSymbol?
+        get() = withValidityAssertion { null }
+
     override val initializer: KtInitializerValue?
         get() = withValidityAssertion { createKtInitializerValue(source as? KtProperty, descriptor, analysisContext) }
 

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/pointers/KtFe10PsiDefaultBackingFieldSymbolPointer.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers
+
+import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
+import org.jetbrains.kotlin.analysis.api.symbols.KtBackingFieldSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
+import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
+
+internal class KtFe10PsiDefaultBackingFieldSymbolPointer(
+    private val propertySymbolPointer: KtPsiBasedSymbolPointer<KtPropertySymbol>,
+) : KtSymbolPointer<KtBackingFieldSymbol>() {
+    @Deprecated("Consider using org.jetbrains.kotlin.analysis.api.KtAnalysisSession.restoreSymbol")
+    override fun restoreSymbol(analysisSession: KtAnalysisSession): KtBackingFieldSymbol? {
+        val property = with(analysisSession) { propertySymbolPointer.restoreSymbol() }
+        return property?.backingFieldSymbol
+    }
+
+    override fun pointsToTheSameSymbolAs(other: KtSymbolPointer<KtSymbol>): Boolean = this === other ||
+            other is KtFe10PsiDefaultBackingFieldSymbolPointer &&
+            other.propertySymbolPointer.pointsToTheSameSymbolAs(propertySymbolPointer)
+}

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultBackingFieldSymbol.kt

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased
+
+import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
+import org.jetbrains.kotlin.analysis.api.annotations.KtAnnotationsList
+import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext
+import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade
+import org.jetbrains.kotlin.analysis.api.descriptors.annotations.KtFe10AnnotationsList
+import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer
+import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10PsiDefaultBackingFieldSymbolPointer
+import org.jetbrains.kotlin.analysis.api.descriptors.utils.cached
+import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken
+import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion
+import org.jetbrains.kotlin.analysis.api.symbols.KtBackingFieldSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KtKotlinPropertySymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySymbol
+import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
+import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
+import org.jetbrains.kotlin.analysis.api.types.KtType
+import org.jetbrains.kotlin.descriptors.FieldDescriptor
+import org.jetbrains.kotlin.descriptors.PropertyDescriptor
+import org.jetbrains.kotlin.descriptors.PropertyGetterDescriptor
+import org.jetbrains.kotlin.descriptors.annotations.Annotations
+import org.jetbrains.kotlin.psi.KtProperty
+import org.jetbrains.kotlin.resolve.BindingContext
+
+internal class KtFe10PsiDefaultBackingFieldSymbol(
+    private val propertyPsi: KtProperty,
+    override val owningProperty: KtKotlinPropertySymbol,
+    val analysisContext: Fe10AnalysisContext
+) : KtBackingFieldSymbol() {
+    val descriptor: FieldDescriptor? by cached {
+        val bindingContext = analysisContext.analyze(propertyPsi, Fe10AnalysisFacade.AnalysisMode.PARTIAL)
+        (bindingContext[BindingContext.VARIABLE, propertyPsi] as? PropertyDescriptor)?.backingField
+    }
+
+    context(KtAnalysisSession)
+    override fun createPointer(): KtSymbolPointer<KtBackingFieldSymbol> = withValidityAssertion {
+        KtPsiBasedSymbolPointer.createForSymbolFromPsi<KtPropertySymbol>(propertyPsi)
+            ?.let(::KtFe10PsiDefaultBackingFieldSymbolPointer)
+            ?: KtFe10NeverRestoringSymbolPointer()
+    }
+
+    override val returnType: KtType
+        get() = withValidityAssertion { owningProperty.returnType }
+
+    override val token: KtLifetimeToken
+        get() = owningProperty.token
+
+    override val annotationsList: KtAnnotationsList
+        get() = withValidityAssertion {
+            KtFe10AnnotationsList.create(descriptor?.annotations ?: Annotations.EMPTY, analysisContext)
+        }
+}

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiKotlinPropertySymbol.kt

@@ -70,6 +70,12 @@ internal class KtFe10PsiKotlinPropertySymbol(
             return KtFe10PsiPropertySetterSymbol(setter, analysisContext)
         }
 
+    override val backingFieldSymbol: KtBackingFieldSymbol?
+        get() = withValidityAssertion {
+            if (psi.isLocal) null
+            else KtFe10PsiDefaultBackingFieldSymbol(propertyPsi = psi, owningProperty = this, analysisContext)
+        }
+
     override val hasBackingField: Boolean
         get() = withValidityAssertion {
             val bindingContext = analysisContext.analyze(psi, AnalysisMode.PARTIAL)
@@ -143,3 +149,4 @@ internal class KtFe10PsiKotlinPropertySymbol(
     override fun equals(other: Any?): Boolean = isEqualTo(other)
     override fun hashCode(): Int = calculateHashCode()
 }
+

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtSymbolByFirBuilder.kt

@@ -402,6 +402,12 @@ internal class KtSymbolByFirBuilder constructor(
             }
         }
 
+        fun buildBackingFieldSymbol(firSymbol: FirBackingFieldSymbol): KtFirBackingFieldSymbol {
+            return symbolsCache.cache(firSymbol) {
+                KtFirBackingFieldSymbol(firSymbol, analysisSession)
+            }
+        }
+
         fun buildExtensionReceiverSymbol(firCallableSymbol: FirCallableSymbol<*>): KtReceiverParameterSymbol? {
             if (firCallableSymbol.fir.receiverParameter == null) return null
             return KtFirReceiverParameterSymbol(firCallableSymbol, analysisSession)

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForDeclaration.kt

@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken
 import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
+import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol
 import org.jetbrains.kotlin.name.ClassId
 
 internal class KtFirAnnotationListForDeclaration private constructor(
@@ -53,10 +54,13 @@ internal class KtFirAnnotationListForDeclaration private constructor(
             useSiteSession: FirSession,
             token: KtLifetimeToken,
         ): KtAnnotationsList {
-            return if (firSymbol.annotations.isEmpty()) {
+            return when {
-                KtEmptyAnnotationsList(token)
+                firSymbol is FirBackingFieldSymbol && firSymbol.propertySymbol.annotations.any { it.useSiteTarget == null } ->
-            } else {
+                    KtFirAnnotationListForDeclaration(firSymbol, useSiteSession, token)
-                KtFirAnnotationListForDeclaration(firSymbol, useSiteSession, token)
+                firSymbol.annotations.isEmpty() ->
+                    KtEmptyAnnotationsList(token)
+                else ->
+                    KtFirAnnotationListForDeclaration(firSymbol, useSiteSession, token)
             }
         }
     }

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForType.kt

@@ -18,8 +18,8 @@ import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
 import org.jetbrains.kotlin.fir.declarations.toAnnotationClassId
 import org.jetbrains.kotlin.fir.expressions.FirAnnotation
-import org.jetbrains.kotlin.fir.symbols.resolvedAnnotationsWithArguments
+import org.jetbrains.kotlin.fir.symbols.resolveAnnotationsWithArguments
-import org.jetbrains.kotlin.fir.symbols.resolvedAnnotationsWithClassIds
+import org.jetbrains.kotlin.fir.symbols.resolveAnnotationsWithClassIds
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.custom
 import org.jetbrains.kotlin.fir.types.customAnnotations
@@ -89,8 +89,8 @@ private fun ConeKotlinType.customAnnotationsWithLazyResolve(phase: FirResolvePha
 
     for (containerSymbol in custom.containerSymbols) {
         when (phase) {
-            FirResolvePhase.TYPES -> annotations.resolvedAnnotationsWithClassIds(containerSymbol)
+            FirResolvePhase.TYPES -> resolveAnnotationsWithClassIds(containerSymbol)
-            FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING -> annotations.resolvedAnnotationsWithArguments(containerSymbol)
+            FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING -> annotations.resolveAnnotationsWithArguments(containerSymbol)
             else -> {}
         }
     }

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolInfoProvider.kt

@@ -33,7 +33,7 @@ internal class KtFirSymbolInfoProvider(
     private val apiVersion = analysisSession.useSiteSession.languageVersionSettings.apiVersion
 
     override fun getDeprecation(symbol: KtSymbol): DeprecationInfo? {
-        if (symbol is KtFirBackingFieldSymbol || symbol is KtFirPackageSymbol || symbol is KtReceiverParameterSymbol) return null
+        if (symbol is KtFirPackageSymbol || symbol is KtReceiverParameterSymbol) return null
         require(symbol is KtFirSymbol<*>) { "${this::class}" }
 
         // Optimization: Avoid building `firSymbol` of `KtFirPsiJavaClassSymbol` if it definitely isn't deprecated.
@@ -44,6 +44,7 @@ internal class KtFirSymbolInfoProvider(
         return when (val firSymbol = symbol.firSymbol) {
             is FirPropertySymbol -> {
                 firSymbol.getDeprecationForCallSite(apiVersion, AnnotationUseSiteTarget.PROPERTY)
+                    ?: firSymbol.backingFieldSymbol?.getDeprecationForCallSite(apiVersion, AnnotationUseSiteTarget.FIELD)
             }
             else -> {
                 firSymbol.getDeprecationForCallSite(apiVersion)
@@ -115,7 +116,9 @@ internal class KtFirSymbolInfoProvider(
     }
 
     private fun getJvmName(property: FirProperty, isSetter: Boolean): Name {
-        if (property.hasAnnotation(StandardClassIds.Annotations.JvmField, analysisSession.useSiteSession)) return property.name
+        if (property.backingField?.symbol?.hasAnnotation(StandardClassIds.Annotations.JvmField, analysisSession.useSiteSession) == true) {
+            return property.name
+        }
         return Name.identifier(getJvmNameAsString(property, isSetter))
     }
 

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt

@@ -11,12 +11,10 @@ import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.KtInitializerValue
 import org.jetbrains.kotlin.analysis.api.base.KtContextReceiver
 import org.jetbrains.kotlin.analysis.api.fir.KtFirAnalysisSession
-import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder
 import org.jetbrains.kotlin.analysis.api.fir.annotations.KtFirAnnotationListForDeclaration
 import org.jetbrains.kotlin.analysis.api.fir.findPsi
 import org.jetbrains.kotlin.analysis.api.fir.symbols.pointers.*
 import org.jetbrains.kotlin.analysis.api.fir.utils.cached
-import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken
 import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion
 import org.jetbrains.kotlin.analysis.api.symbols.*
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolKind
@@ -24,7 +22,6 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointe
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.UnsupportedSymbolKind
 import org.jetbrains.kotlin.analysis.api.types.KtType
-import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirResolveSession
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.fir.containingClassLookupTag
@@ -97,6 +94,10 @@ internal class KtFirKotlinPropertySymbol(
         get() = withValidityAssertion {
             firSymbol.setterSymbol?.let { builder.callableBuilder.buildPropertyAccessorSymbol(it) } as? KtPropertySetterSymbol
         }
+    override val backingFieldSymbol: KtBackingFieldSymbol?
+        get() = withValidityAssertion {
+            firSymbol.backingFieldSymbol?.let { builder.callableBuilder.buildBackingFieldSymbol(it) }
+        }
 
     // NB: `field` in accessors indicates the property should have a backing field. To see that, though, we need BODY_RESOLVE.
     override val hasBackingField: Boolean

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt

@@ -84,6 +84,9 @@ internal class KtFirSyntheticJavaPropertySymbol(
             firSymbol.setterSymbol?.let { builder.callableBuilder.buildPropertyAccessorSymbol(it) } as? KtPropertySetterSymbol
         }
 
+    override val backingFieldSymbol: KtBackingFieldSymbol?
+        get() = null
+
     override val isFromPrimaryConstructor: Boolean get() = withValidityAssertion { false }
     override val isOverride: Boolean get() = withValidityAssertion { firSymbol.isOverride }
     override val isStatic: Boolean get() = withValidityAssertion { firSymbol.isStatic }

analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/declarations/ktRendererUtils.kt

@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.annotations.KtAnnotated
 import org.jetbrains.kotlin.analysis.api.base.KtContextReceiversOwner
 import org.jetbrains.kotlin.analysis.api.symbols.KtDeclarationSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySymbol
 import org.jetbrains.kotlin.analysis.utils.printer.PrettyPrinter
 import org.jetbrains.kotlin.lexer.KtKeywordToken
 
@@ -30,14 +31,20 @@ public fun <S> renderAnnotationsModifiersAndContextReceivers(
     renderContextReceivers(symbol, printer)
 
     val annotationsRendered: Boolean
+    val fieldAnnotationsRendered: Boolean
     val modifiersRendered: Boolean
     codeStyle.getSeparatorBetweenAnnotationAndOwner(symbol).separated(
         { annotationsRendered = checkIfPrinted { annotationRenderer.renderAnnotations(symbol, printer) } },
+        {
+            fieldAnnotationsRendered = checkIfPrinted {
+                if (symbol is KtPropertySymbol) symbol.backingFieldSymbol?.let { annotationRenderer.renderAnnotations(it, printer) }
+            }
+        },
         { modifiersRendered = checkIfPrinted { modifiersRenderer.renderDeclarationModifiers(symbol, printer) } }
     )
     val separator = when {
-        annotationsRendered && !modifiersRendered -> codeStyle.getSeparatorBetweenAnnotationAndOwner(symbol)
+        (annotationsRendered || fieldAnnotationsRendered) && !modifiersRendered -> codeStyle.getSeparatorBetweenAnnotationAndOwner(symbol)
-        annotationsRendered || modifiersRendered -> codeStyle.getSeparatorBetweenModifiers()
+        annotationsRendered || fieldAnnotationsRendered || modifiersRendered -> codeStyle.getSeparatorBetweenModifiers()
         else -> ""
     }
 
@@ -54,6 +61,7 @@ public fun <S> renderAnnotationsModifiersAndContextReceivers(
     renderContextReceivers(symbol, printer)
     codeStyle.getSeparatorBetweenAnnotationAndOwner(symbol).separated(
         { annotationRenderer.renderAnnotations(symbol, printer) },
+        { if (symbol is KtPropertySymbol) symbol.backingFieldSymbol?.let { annotationRenderer.renderAnnotations(it, printer) } },
         { modifiersRenderer.renderDeclarationModifiers(symbol, printer) }
     )
 }

analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt

@@ -187,6 +187,13 @@ public class DebugSymbolRenderer(
             else -> error("Unsupported symbol ${symbol::class.java.name}")
         }
         append(")")
+        if (symbol is KtBackingFieldSymbol && symbol.annotationsList.annotations.isNotEmpty()) {
+            appendLine()
+            withIndent {
+                append("annotationsList: ")
+                renderAnnotationsList(symbol.annotationsList)
+            }
+        }
     }
 
     context(KtAnalysisSession)

analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtVariableLikeSymbol.kt

@@ -52,7 +52,7 @@ public abstract class KtBackingFieldSymbol : KtVariableLikeSymbol() {
         get() = withValidityAssertion { emptyList() }
 
     context(KtAnalysisSession)
-    abstract override fun createPointer(): KtSymbolPointer<KtVariableLikeSymbol>
+    abstract override fun createPointer(): KtSymbolPointer<KtBackingFieldSymbol>
 
     public companion object {
         private val fieldName = StandardNames.BACKING_FIELD
@@ -114,6 +114,7 @@ public sealed class KtPropertySymbol : KtVariableSymbol(),
 
     public abstract val getter: KtPropertyGetterSymbol?
     public abstract val setter: KtPropertySetterSymbol?
+    public abstract val backingFieldSymbol: KtBackingFieldSymbol?
 
     public abstract val hasBackingField: Boolean
 

analysis/analysis-api/testData/annotations/annotationsOnDeclaration/direct/onProperty_javaAnnotation_targets.descriptors.txt

@@ -1,3 +0,0 @@
-KtDeclaration: KtProperty foo
-annotations: [
-]

analysis/analysis-api/testData/annotations/annotationsOnDeclaration/direct/onProperty_javaAnnotation_targets.txt

@@ -1,5 +1,3 @@
 KtDeclaration: KtProperty foo
 annotations: [
-  JavaAnno(types = java.lang.annotation.ElementType.FIELD)
-    psi: KtAnnotationEntry
 ]

analysis/analysis-api/testData/annotations/metaAnnotations/onProperty_javaAnnotation_varargParameter.descriptors.txt

@@ -1,3 +0,0 @@
-KtDeclaration: KtProperty foo
-annotations: [
-]

analysis/analysis-api/testData/annotations/metaAnnotations/onProperty_javaAnnotation_varargParameter.txt

@@ -1,21 +1,3 @@
 KtDeclaration: KtProperty foo
 annotations: [
-  JavaAnno(value = [java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD])
-    psi: KtAnnotationEntry
-    annotations: [
-      kotlin/annotation/Target(allowedTargets = [kotlin.annotation.AnnotationTarget.FIELD, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.PROPERTY_SETTER])
-        psi: null
-        annotations: [
-          kotlin/annotation/Target(allowedTargets = [kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS])
-            psi: null
-            <recursive meta-annotation kotlin/annotation/Target>
-          kotlin/annotation/MustBeDocumented()
-            psi: null
-            annotations: [
-              kotlin/annotation/Target(allowedTargets = [kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS])
-                psi: null
-                <recursive meta-annotation kotlin/annotation/Target>
-            ]
-        ]
-    ]
 ]

analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.descriptors.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /I.foo
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: null
   callableIdIfNonLocal: /A.foo
   contextReceivers: []
   getter: null

analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.descriptors.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /I.zoo
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -241,6 +242,7 @@ KtFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /I.foo
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -307,6 +309,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /I.bar
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -444,6 +447,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /I.doo
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: null
   callableIdIfNonLocal: /A.zoo
   contextReceivers: []
   getter: null
@@ -83,6 +84,7 @@ KtFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: null
   callableIdIfNonLocal: /A.foo
   contextReceivers: []
   getter: null
@@ -166,6 +168,7 @@ KtFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: null
   callableIdIfNonLocal: /A.bar
   contextReceivers: []
   getter: null
@@ -206,6 +209,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: null
   callableIdIfNonLocal: /A.doo
   contextReceivers: []
   getter: null

analysis/analysis-api/testData/components/scopeProvider/fileScopeTest/fileScope.descriptors.txt

@@ -97,6 +97,7 @@ KtFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /testVal
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -155,6 +156,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /initializedVariable
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -280,6 +282,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /unitializedVariable
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -405,6 +408,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /lateinitVariable
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -530,6 +534,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /variableWithBackingField
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -655,6 +660,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /privateSetter
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -783,6 +789,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /jvmNameOnSetter
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -911,6 +918,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /customGetter
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -972,6 +980,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /jvmNameOnGetter
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -1033,6 +1042,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /propertyWithReceiver
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -1109,6 +1119,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /propertyWithGenericReceiver
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -1185,6 +1196,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /constant
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -1243,6 +1255,11 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
+    annotationsList: [
+      kotlin/jvm/JvmField()
+        psi: KtAnnotationEntry
+    ]
   callableIdIfNonLocal: /jvmField
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/components/scopeProvider/fileScopeTest/fileScope.txt

@@ -97,6 +97,7 @@ KtFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /testVal
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -155,6 +156,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /initializedVariable
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -280,6 +282,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /unitializedVariable
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -405,6 +408,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /lateinitVariable
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -530,6 +534,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /variableWithBackingField
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -655,6 +660,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /privateSetter
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -783,6 +789,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /jvmNameOnSetter
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -911,6 +918,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /customGetter
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -972,6 +980,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /jvmNameOnGetter
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -1033,6 +1042,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /propertyWithReceiver
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -1109,6 +1119,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /propertyWithGenericReceiver
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -1185,6 +1196,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /constant
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -1242,10 +1254,12 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotationsList: [
+  annotationsList: []
-    kotlin/jvm/JvmField()
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
-      psi: KtAnnotationEntry
+    annotationsList: [
-  ]
+      kotlin/jvm/JvmField()
+        psi: KtAnnotationEntry
+    ]
   callableIdIfNonLocal: /jvmField
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/components/scopeProvider/fileScopeTest/simpleFileScope.txt

@@ -41,6 +41,7 @@ KtFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /testVal
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/MutableList.txt

@@ -1242,6 +1242,7 @@ KtFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: kotlin/collections/List.size
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/dataClass.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Abc.firstProperty
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -66,6 +67,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Abc.secondProperty
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -132,6 +134,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Abc.thirdProperty
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -232,6 +235,7 @@ KtFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Abc.bodyProperty
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -661,6 +665,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /Abc.firstProperty
         contextReceivers: []
         getter: KtPropertyGetterSymbol:
@@ -747,6 +752,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /Abc.secondProperty
         contextReceivers: []
         getter: KtPropertyGetterSymbol:
@@ -833,6 +839,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /Abc.thirdProperty
         contextReceivers: []
         getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntry.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: null
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -301,6 +302,7 @@ KtKotlinPropertySymbol:
     kotlin/internal/IntrinsicConstEvaluation()
       psi: null
   ]
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: kotlin/Enum.name
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -375,6 +377,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: kotlin/Enum.ordinal
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/java.lang.String.txt

@@ -108,6 +108,7 @@ KtJavaFieldSymbol:
 
 KtSyntheticJavaPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: null
   callableIdIfNonLocal: java/lang/String.length
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.txt

@@ -45,6 +45,7 @@ scopes:
     callables: 9
       KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: null
         contextReceivers: []
         getter: KtPropertyGetterSymbol:
@@ -301,6 +302,7 @@ scopes:
           kotlin/internal/IntrinsicConstEvaluation()
             psi: null
         ]
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: kotlin/Enum.name
         contextReceivers: []
         getter: KtPropertyGetterSymbol:
@@ -350,6 +352,7 @@ scopes:
         visibility: Public
       KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: kotlin/Enum.ordinal
         contextReceivers: []
         getter: KtPropertyGetterSymbol:
@@ -498,6 +501,7 @@ scopes:
         visibility: Public
       KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: null
         callableIdIfNonLocal: /E.entries
         contextReceivers: []
         getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/localTypeScope.txt

@@ -33,6 +33,7 @@ scopes:
     callables: 5
       KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: null
         contextReceivers: []
         getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/components/scopeProvider/typeScope/innerClassTypeParamsSubstitution.txt

@@ -146,6 +146,7 @@ KtFunctionSymbol:
   visibility: Public
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Outer.A.map
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/components/scopeProvider/typeScope/intList.txt

@@ -606,6 +606,7 @@ KtFunctionSymbol:
   visibility: Public
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: kotlin/collections/List.size
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/components/scopeProvider/typeScope/outerClassTypeParamsSubstitution.txt

@@ -140,6 +140,7 @@ KtFunctionSymbol:
   visibility: Public
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Outer.A.map
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/components/scopeProvider/typeScope/outerTypeParamsSubstitution.txt

@@ -132,6 +132,7 @@ KtFunctionSymbol:
   visibility: Public
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /A.map
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/components/scopeProvider/typeScope/typeParamList.txt

@@ -606,6 +606,7 @@ KtFunctionSymbol:
   visibility: Public
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: kotlin/collections/List.size
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.pretty.txt

@@ -1,6 +0,0 @@
-@PropertyAnnotation
-var prop: kotlin.Int
-  @GetAnnotation
-  get()
-  @SetAnnotation
-  set(@SetparamAnnotation value: kotlin.Int)

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.txt

@@ -3,6 +3,11 @@ KtKotlinPropertySymbol:
     PropertyAnnotation()
       psi: KtAnnotationEntry
   ]
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
+    annotationsList: [
+      FieldAnnotation()
+        psi: KtAnnotationEntry
+    ]
   callableIdIfNonLocal: /prop
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.pretty.txt

@@ -1,5 +1,5 @@
 @PropertyAnnotation
-@field:FieldAnnotation
+@FieldAnnotation
 var prop: kotlin.Int
   @GetAnnotation
   get()

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.txt

@@ -2,9 +2,12 @@ KtKotlinPropertySymbol:
   annotationsList: [
     PropertyAnnotation()
       psi: KtAnnotationEntry
-    FieldAnnotation()
-      psi: KtAnnotationEntry
   ]
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
+    annotationsList: [
+      FieldAnnotation()
+        psi: KtAnnotationEntry
+    ]
   callableIdIfNonLocal: /prop
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.descriptors.pretty.txt

@@ -1,4 +1,5 @@
 @PropertyAnnotation
+@FieldAnnotation
 var x: kotlin.Int
   @GetAnnotation
   @ExplicitGetAnnotation

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.descriptors.txt

@@ -3,6 +3,11 @@ KtKotlinPropertySymbol:
     PropertyAnnotation()
       psi: KtAnnotationEntry
   ]
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
+    annotationsList: [
+      FieldAnnotation()
+        psi: KtAnnotationEntry
+    ]
   callableIdIfNonLocal: /x
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.pretty.txt

@@ -1,5 +1,5 @@
 @PropertyAnnotation
-@field:FieldAnnotation
+@FieldAnnotation
 var x: kotlin.Int
   @ExplicitGetAnnotation
   @GetAnnotation

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.txt

@@ -2,9 +2,12 @@ KtKotlinPropertySymbol:
   annotationsList: [
     PropertyAnnotation()
       psi: KtAnnotationEntry
-    FieldAnnotation()
-      psi: KtAnnotationEntry
   ]
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
+    annotationsList: [
+      FieldAnnotation()
+        psi: KtAnnotationEntry
+    ]
   callableIdIfNonLocal: /x
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.descriptors.txt

@@ -5,6 +5,7 @@ KtKotlinPropertySymbol:
     ExplicitPropertyAnnotation()
       psi: KtAnnotationEntry
   ]
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /lazyProperty
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.pretty.txt

@@ -1,5 +1,5 @@
 @ExplicitPropertyAnnotation
-@delegate:DelegateAnnotation
 @PropertyAnnotation
+@delegate:DelegateAnnotation
 val lazyProperty: kotlin.Int
   get()

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.txt

@@ -2,11 +2,14 @@ KtKotlinPropertySymbol:
   annotationsList: [
     ExplicitPropertyAnnotation()
       psi: KtAnnotationEntry
-    DelegateAnnotation()
-      psi: KtAnnotationEntry
     PropertyAnnotation()
       psi: KtAnnotationEntry
   ]
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
+    annotationsList: [
+      DelegateAnnotation()
+        psi: KtAnnotationEntry
+    ]
   callableIdIfNonLocal: /lazyProperty
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /prop
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnPropertyReceiverType.descriptors.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /foo
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnPropertyReceiverType.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /foo
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnPropertyReturnType.descriptors.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /foo
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/singleSymbolByPsi/typeAnnotationsOnPropertyReturnType.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /foo
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt

@@ -21,6 +21,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /Anno.param1
         contextReceivers: []
         getter: KtPropertyGetterSymbol:
@@ -107,6 +108,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /Anno.param2
         contextReceivers: []
         getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt

@@ -21,6 +21,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /Anno.param1
         contextReceivers: []
         getter: KtPropertyGetterSymbol:
@@ -107,6 +108,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /Anno.param2
         contextReceivers: []
         getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt

@@ -34,6 +34,7 @@ KtFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: null
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -118,6 +119,7 @@ KtAnonymousObjectSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /AnonymousContainer.anonymousObject
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt

@@ -34,6 +34,7 @@ KtFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: null
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -118,6 +119,7 @@ KtAnonymousObjectSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /AnonymousContainer.anonymousObject
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /p
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /A.i
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /A.a
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.descriptors.txt

@@ -21,6 +21,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /A.a
         contextReceivers: []
         getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt

@@ -21,6 +21,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /A.a
         contextReceivers: []
         getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnProperty.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /y
   contextReceivers: [
     KtContextReceiver:

analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt

@@ -21,6 +21,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /MyColor.x
         contextReceivers: []
         getter: KtPropertyGetterSymbol:
@@ -107,6 +108,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /MyColor.y
         contextReceivers: []
         getter: KtPropertyGetterSymbol:
@@ -193,6 +195,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /MyColor.z
         contextReceivers: []
         getter: KtPropertyGetterSymbol:
@@ -325,6 +328,7 @@ KtAnonymousFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Some.delegate
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -409,6 +413,7 @@ KtAnonymousFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Some.lambda
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -485,6 +490,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Some.nonLazy
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt

@@ -21,6 +21,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /MyColor.x
         contextReceivers: []
         getter: KtPropertyGetterSymbol:
@@ -107,6 +108,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /MyColor.y
         contextReceivers: []
         getter: KtPropertyGetterSymbol:
@@ -193,6 +195,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /MyColor.z
         contextReceivers: []
         getter: KtPropertyGetterSymbol:
@@ -325,6 +328,7 @@ KtAnonymousFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Some.delegate
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -405,6 +409,7 @@ KtAnonymousFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Some.lambda
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -481,6 +486,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Some.nonLazy
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/delegatedProp.descriptors.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /delegatedProp
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/delegatedProp.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /delegatedProp
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.pretty.txt

@@ -1,38 +0,0 @@
-@kotlin.Deprecated(message = "don't use i")
-val i: kotlin.Int
-
-val i2: kotlin.Int
-  @kotlin.Deprecated(message = "don't use getter of i2")
-  get()
-
-var i3: kotlin.Int
-  @kotlin.Deprecated(message = "don't use getter of i3")
-  set(value: kotlin.Int)
-
-var i4: kotlin.Int
-  @kotlin.Deprecated(message = "don't use getter of i4")
-  get()
-  @kotlin.Deprecated(message = "don't use setter of i4")
-  set(value: kotlin.Int)
-
-@kotlin.Deprecated(message = "don't use f")
-fun f(): kotlin.Int
-
-@kotlin.Deprecated(message = "don't use j", level = kotlin.DeprecationLevel.ERROR)
-val j: kotlin.Int
-
-@kotlin.Deprecated(message = "don't use j2", level = kotlin.DeprecationLevel.HIDDEN)
-val j2: kotlin.Int
-
-val j2: kotlin.Int
-
-@kotlin.Deprecated(message = "don't use MyClass")
-class MyClass
-
-class Foo {
-  @kotlin.Deprecated(message = "don't use i2")
-  val i2: kotlin.Int
-
-  @kotlin.Deprecated(message = "don't use f2")
-  fun f2(): kotlin.Int
-}

analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt

@@ -3,6 +3,7 @@ KtKotlinPropertySymbol:
     kotlin/Deprecated(message = "don't use i")
       psi: KtAnnotationEntry
   ]
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /i
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -61,6 +62,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /i2
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -122,6 +124,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /i3
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -251,6 +254,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /i4
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -449,6 +453,7 @@ KtKotlinPropertySymbol:
     kotlin/Deprecated(message = "don't use i2")
       psi: KtAnnotationEntry
   ]
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Foo.i2
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -582,6 +587,7 @@ KtKotlinPropertySymbol:
     kotlin/Deprecated(level = kotlin.DeprecationLevel.ERROR, message = "don't use j")
       psi: KtAnnotationEntry
   ]
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /j
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -643,6 +649,7 @@ KtKotlinPropertySymbol:
     kotlin/Deprecated(level = kotlin.DeprecationLevel.HIDDEN, message = "don't use j2")
       psi: KtAnnotationEntry
   ]
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /j2
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -701,7 +708,12 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
-  callableIdIfNonLocal: /j2
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
+    annotationsList: [
+      java/lang/Deprecated()
+        psi: KtAnnotationEntry
+    ]
+  callableIdIfNonLocal: /j3
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
     annotationsList: []
@@ -739,7 +751,7 @@ KtKotlinPropertySymbol:
   isStatic: false
   isVal: true
   modality: FINAL
-  name: j2
+  name: j3
   origin: SOURCE
   receiverParameter: null
   returnType: KtUsualClassType:
@@ -753,6 +765,6 @@ KtKotlinPropertySymbol:
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=null)
   getterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=null)
-  javaGetterName: getJ2
+  javaGetterName: getJ3
   javaSetterName: null
   setterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=null)

analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.kt

@@ -1,4 +1,4 @@
-// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE
+// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1
 // WITH_STDLIB
 
 @Deprecated("don't use i")
@@ -35,4 +35,4 @@ val j: Int = 2
 val j2: Int = 2
 
 @java.lang.Deprecated
-val j2: Int = 2
+val j3: Int = 2

analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.pretty.txt

@@ -25,7 +25,7 @@ val j: kotlin.Int
 val j2: kotlin.Int
 
 @java.lang.Deprecated
-val j2: kotlin.Int
+val j3: kotlin.Int
 
 @kotlin.Deprecated(message = "don't use MyClass")
 class MyClass

analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt

@@ -3,6 +3,7 @@ KtKotlinPropertySymbol:
     kotlin/Deprecated(message = "don't use i")
       psi: KtAnnotationEntry
   ]
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /i
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -61,6 +62,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /i2
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -122,6 +124,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /i3
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -250,6 +253,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /i4
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -447,6 +451,7 @@ KtKotlinPropertySymbol:
     kotlin/Deprecated(message = "don't use i2")
       psi: KtAnnotationEntry
   ]
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Foo.i2
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -580,6 +585,7 @@ KtKotlinPropertySymbol:
     kotlin/Deprecated(level = kotlin.DeprecationLevel.ERROR, message = "don't use j")
       psi: KtAnnotationEntry
   ]
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /j
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -641,6 +647,7 @@ KtKotlinPropertySymbol:
     kotlin/Deprecated(level = kotlin.DeprecationLevel.HIDDEN, message = "don't use j2")
       psi: KtAnnotationEntry
   ]
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /j2
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -698,11 +705,13 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: DeprecationInfo(deprecationLevel=HIDDEN, propagatesToOverrides=true, message=null)
 
 KtKotlinPropertySymbol:
-  annotationsList: [
+  annotationsList: []
-    java/lang/Deprecated()
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
-      psi: KtAnnotationEntry
+    annotationsList: [
-  ]
+      java/lang/Deprecated()
-  callableIdIfNonLocal: /j2
+        psi: KtAnnotationEntry
+    ]
+  callableIdIfNonLocal: /j3
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
     annotationsList: []
@@ -740,7 +749,7 @@ KtKotlinPropertySymbol:
   isStatic: false
   isVal: true
   modality: FINAL
-  name: j2
+  name: j3
   origin: SOURCE
   receiverParameter: null
   returnType: KtUsualClassType:
@@ -752,8 +761,8 @@ KtKotlinPropertySymbol:
   typeParameters: []
   visibility: Public
   getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=null)
+  deprecationStatus: null
-  getterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=null)
+  getterDeprecationStatus: null
-  javaGetterName: getJ2
+  javaGetterName: getJ3
   javaSetterName: null
-  setterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=null)
+  setterDeprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.txt

@@ -21,6 +21,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /P.x
         contextReceivers: []
         getter: KtPropertyGetterSymbol:
@@ -107,6 +108,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /P.y
         contextReceivers: []
         getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.txt

@@ -21,6 +21,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /P.x
         contextReceivers: []
         getter: KtPropertyGetterSymbol:
@@ -107,6 +108,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /P.y
         contextReceivers: []
         getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/dynamic.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Foo.p
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.descriptors.txt

@@ -120,6 +120,7 @@ KtFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: null
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -404,6 +405,7 @@ KtFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /MyEnumClass.i
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.txt

@@ -120,6 +120,7 @@ KtFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: null
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -400,6 +401,7 @@ KtFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /MyEnumClass.i
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryProperties.descriptors.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: null
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -102,6 +103,7 @@ KtEnumEntrySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: null
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -168,6 +170,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: null
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryProperties.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: null
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -102,6 +103,7 @@ KtEnumEntrySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: null
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -168,6 +170,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: null
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt

@@ -21,6 +21,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /Style.value
         contextReceivers: []
         getter: KtPropertyGetterSymbol:
@@ -108,6 +109,7 @@ KtConstructorSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: null
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -192,6 +194,7 @@ KtEnumEntrySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Style.exitAnimation
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt

@@ -21,6 +21,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /Style.value
         contextReceivers: []
         getter: KtPropertyGetterSymbol:
@@ -108,6 +109,7 @@ KtConstructorSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: null
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -188,6 +190,7 @@ KtEnumEntrySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Style.exitAnimation
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/explicitBackingField.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /p
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.descriptors.pretty.txt

@@ -1,3 +0,0 @@
-var jvmField: kotlin.Long
-
-var jvmFieldOnField: kotlin.Int

analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.descriptors.txt

@@ -1,5 +1,10 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
+    annotationsList: [
+      kotlin/jvm/JvmField()
+        psi: KtAnnotationEntry
+    ]
   callableIdIfNonLocal: /jvmField
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -126,6 +131,11 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
+    annotationsList: [
+      kotlin/jvm/JvmField()
+        psi: KtAnnotationEntry
+    ]
   callableIdIfNonLocal: /jvmFieldOnField
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.pretty.txt

@@ -1,5 +1,5 @@
 @kotlin.jvm.JvmField
 var jvmField: kotlin.Long
 
-@field:kotlin.jvm.JvmField
+@kotlin.jvm.JvmField
 var jvmFieldOnField: kotlin.Int

analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.txt

@@ -1,8 +1,10 @@
 KtKotlinPropertySymbol:
-  annotationsList: [
+  annotationsList: []
-    kotlin/jvm/JvmField()
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
-      psi: KtAnnotationEntry
+    annotationsList: [
-  ]
+      kotlin/jvm/JvmField()
+        psi: KtAnnotationEntry
+    ]
   callableIdIfNonLocal: /jvmField
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -127,10 +129,12 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotationsList: [
+  annotationsList: []
-    kotlin/jvm/JvmField()
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
-      psi: KtAnnotationEntry
+    annotationsList: [
-  ]
+      kotlin/jvm/JvmField()
+        psi: KtAnnotationEntry
+    ]
   callableIdIfNonLocal: /jvmFieldOnField
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Foo.i
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -140,6 +141,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Foo.j
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Foo.i
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -143,6 +144,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /Foo.j
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /A.x
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -66,6 +67,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /A.y
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /A.x
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -66,6 +67,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /A.y
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/propertiesFromCompanion.descriptors.pretty.txt

@@ -1,19 +0,0 @@
-class MyClass {
-  companion object {
-    val property: kotlin.Int
-
-    const val constProperty: kotlin.Int
-
-    @kotlin.jvm.JvmStatic
-    val staticProperty: kotlin.Int
-
-    val fieldProperty: kotlin.Int
-
-    var variable: kotlin.Int
-
-    @kotlin.jvm.JvmStatic
-    var staticVariable: kotlin.Int
-
-    var fieldVariable: kotlin.Int
-  }
-}

analysis/analysis-api/testData/symbols/symbolByPsi/propertiesFromCompanion.descriptors.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /MyClass.Companion.property
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -66,6 +67,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /MyClass.Companion.constProperty
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -135,6 +137,7 @@ KtKotlinPropertySymbol:
     kotlin/jvm/JvmStatic()
       psi: KtAnnotationEntry
   ]
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /MyClass.Companion.staticProperty
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -201,6 +204,11 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
+    annotationsList: [
+      kotlin/jvm/JvmField()
+        psi: KtAnnotationEntry
+    ]
   callableIdIfNonLocal: /MyClass.Companion.fieldProperty
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -267,6 +275,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /MyClass.Companion.variable
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -404,6 +413,7 @@ KtKotlinPropertySymbol:
     kotlin/jvm/JvmStatic()
       psi: KtAnnotationEntry
   ]
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /MyClass.Companion.staticVariable
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -538,6 +548,11 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
+    annotationsList: [
+      kotlin/jvm/JvmField()
+        psi: KtAnnotationEntry
+    ]
   callableIdIfNonLocal: /MyClass.Companion.fieldVariable
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/propertiesFromCompanion.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /MyClass.Companion.property
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -66,6 +67,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /MyClass.Companion.constProperty
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -135,6 +137,7 @@ KtKotlinPropertySymbol:
     kotlin/jvm/JvmStatic()
       psi: KtAnnotationEntry
   ]
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /MyClass.Companion.staticProperty
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -200,10 +203,12 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotationsList: [
+  annotationsList: []
-    kotlin/jvm/JvmField()
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
-      psi: KtAnnotationEntry
+    annotationsList: [
-  ]
+      kotlin/jvm/JvmField()
+        psi: KtAnnotationEntry
+    ]
   callableIdIfNonLocal: /MyClass.Companion.fieldProperty
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -270,6 +275,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /MyClass.Companion.variable
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -410,6 +416,7 @@ KtKotlinPropertySymbol:
     kotlin/jvm/JvmStatic()
       psi: KtAnnotationEntry
   ]
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /MyClass.Companion.staticVariable
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -546,10 +553,12 @@ KtKotlinPropertySymbol:
   setterDeprecationStatus: null
 
 KtKotlinPropertySymbol:
-  annotationsList: [
+  annotationsList: []
-    kotlin/jvm/JvmField()
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
-      psi: KtAnnotationEntry
+    annotationsList: [
-  ]
+      kotlin/jvm/JvmField()
+        psi: KtAnnotationEntry
+    ]
   callableIdIfNonLocal: /MyClass.Companion.fieldVariable
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt

@@ -1,5 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /x
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -58,6 +59,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /y
   contextReceivers: []
   getter: KtPropertyGetterSymbol:
@@ -134,6 +136,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /get
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt

@@ -141,6 +141,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /Anno5.s
         contextReceivers: []
         getter: KtPropertyGetterSymbol:
@@ -348,6 +349,7 @@ KtFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /X.x
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt

@@ -141,6 +141,7 @@ KtConstructorSymbol:
       contextReceivers: []
       generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
         annotationsList: []
+        backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
         callableIdIfNonLocal: /Anno5.s
         contextReceivers: []
         getter: KtPropertyGetterSymbol:
@@ -348,6 +349,7 @@ KtFunctionSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: []
+  backingFieldSymbol: KtBackingFieldSymbol(<local>/field)
   callableIdIfNonLocal: /X.x
   contextReceivers: []
   getter: KtPropertyGetterSymbol:

analysis/analysis-api/testData/symbols/symbolByReference/accessorField.descriptors.txt

@@ -0,0 +1,17 @@
+KtBackingFieldSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: null
+  contextReceivers: []
+  isExtension: false
+  name: field
+  origin: PROPERTY_BACKING_FIELD
+  owningProperty: KtKotlinPropertySymbol(/x)
+  receiverParameter: null
+  returnType: KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: kotlin/Int
+  symbolKind: LOCAL
+  typeParameters: []
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null

analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt

@@ -1,5 +1,8 @@
 KtBackingFieldSymbol:
-  annotationsList: []
+  annotationsList: [
+    FieldAnnotation()
+      psi: KtAnnotationEntry
+  ]
   callableIdIfNonLocal: null
   contextReceivers: []
   isExtension: false