azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SLC] SymbolLightAccessorMethod: reduce number of requests on symbol restoring

Browse Source 
We can avoid extra restoring of property accessors
if the corresponding property is already restored

^KT-57850
This commit is contained in:
Dmitrii Gridin
2023-04-13 16:52:43 +02:00
committed by Space Team
parent 5d1c853adf
commit f85dc95b66
1 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightAccessorMethod.kt
+22 -24
View File
@@ -78,22 +78,21 @@ internal class SymbolLightAccessorMethod private constructor(
) )
context(KtAnalysisSession) context(KtAnalysisSession)
private fun propertyAccessorSymbol(): KtPropertyAccessorSymbol { private val KtPropertySymbol.accessorSymbol: KtPropertyAccessorSymbol
return propertyAccessorSymbolPointer.restoreSymbolOrThrowIfDisposed() get() = if (isGetter) getter!! else setter!!
}
context(KtAnalysisSession) private inline fun <T> withPropertySymbol(crossinline action: KtAnalysisSession.(KtPropertySymbol) -> T): T =
private fun propertySymbol(): KtPropertySymbol { containingPropertySymbolPointer.withSymbol(ktModule, action)
return containingPropertySymbolPointer.restoreSymbolOrThrowIfDisposed()
} private inline fun <T> withAccessorSymbol(crossinline action: KtAnalysisSession.(KtPropertyAccessorSymbol) -> T): T =
propertyAccessorSymbolPointer.withSymbol(ktModule, action)
private fun String.abiName() = if (isGetter) getterName(this) else setterName(this) private fun String.abiName() = if (isGetter) getterName(this) else setterName(this)
private val _name: String by lazyPub { private val _name: String by lazyPub {
analyzeForLightClasses(ktModule) { withPropertySymbol { propertySymbol ->
val accessorSymbol = propertyAccessorSymbol() val accessorSymbol = propertySymbol.accessorSymbol
accessorSymbol.getJvmNameFromAnnotation(accessorSite.toOptionalFilter()) ?: run { accessorSymbol.getJvmNameFromAnnotation(accessorSite.toOptionalFilter()) ?: run {
val propertySymbol = propertySymbol()
val defaultName = propertySymbol.name.identifier.let { val defaultName = propertySymbol.name.identifier.let {
if (this@SymbolLightAccessorMethod.containingClass.isAnnotationType) it else it.abiName() if (this@SymbolLightAccessorMethod.containingClass.isAnnotationType) it else it.abiName()
} }
@@ -137,7 +136,7 @@ internal class SymbolLightAccessorMethod private constructor(
private val isParameter: Boolean get() = containingPropertyDeclaration == null || containingPropertyDeclaration is KtParameter private val isParameter: Boolean get() = containingPropertyDeclaration == null || containingPropertyDeclaration is KtParameter
override fun computeThrowsList(builder: LightReferenceListBuilder) { override fun computeThrowsList(builder: LightReferenceListBuilder) {
propertyAccessorSymbolPointer.withSymbol(ktModule) { accessorSymbol -> withAccessorSymbol { accessorSymbol ->
accessorSymbol.computeThrowsList( accessorSymbol.computeThrowsList(
builder, builder,
this@SymbolLightAccessorMethod, this@SymbolLightAccessorMethod,
@@ -157,7 +156,7 @@ internal class SymbolLightAccessorMethod private constructor(
val modality = if (containingClass.isInterface) { val modality = if (containingClass.isInterface) {
PsiModifier.ABSTRACT PsiModifier.ABSTRACT
} else { } else {
containingPropertySymbolPointer.withSymbol(ktModule) { propertySymbol -> withPropertySymbol { propertySymbol ->
propertySymbol.computeSimpleModality()?.takeUnless { it.isSuppressedFinalModifier(containingClass, propertySymbol) } propertySymbol.computeSimpleModality()?.takeUnless { it.isSuppressedFinalModifier(containingClass, propertySymbol) }
} }
} }
@@ -178,14 +177,13 @@ internal class SymbolLightAccessorMethod private constructor(
else -> null else -> null
} }
private fun isStatic(): Boolean = analyzeForLightClasses(ktModule) { private fun isStatic(): Boolean = withPropertySymbol { propertySymbol ->
val propertySymbol = propertySymbol()
if (propertySymbol.isStatic) { if (propertySymbol.isStatic) {
return@analyzeForLightClasses true return@withPropertySymbol true
} }
val filter = accessorSite.toOptionalFilter() val filter = accessorSite.toOptionalFilter()
propertySymbol.hasJvmStaticAnnotation(filter) || propertyAccessorSymbol().hasJvmStaticAnnotation(filter) propertySymbol.hasJvmStaticAnnotation(filter) || propertySymbol.accessorSymbol.hasJvmStaticAnnotation(filter)
} }
private val _modifierList: PsiModifierList by lazyPub { private val _modifierList: PsiModifierList by lazyPub {
@@ -212,7 +210,7 @@ internal class SymbolLightAccessorMethod private constructor(
!modifierList.hasModifierProperty(PsiModifier.PRIVATE) !modifierList.hasModifierProperty(PsiModifier.PRIVATE)
if (nullabilityApplicable) { if (nullabilityApplicable) {
containingPropertySymbolPointer.withSymbol(ktModule) { propertySymbol -> withPropertySymbol { propertySymbol ->
if (propertySymbol.isLateInit) NullabilityType.NotNull else getTypeNullability(propertySymbol.returnType) if (propertySymbol.isLateInit) NullabilityType.NotNull else getTypeNullability(propertySymbol.returnType)
} }
} else { } else {
@@ -230,9 +228,9 @@ internal class SymbolLightAccessorMethod private constructor(
override fun isConstructor(): Boolean = false override fun isConstructor(): Boolean = false
private val _isDeprecated: Boolean by lazyPub { private val _isDeprecated: Boolean by lazyPub {
analyzeForLightClasses(ktModule) { withPropertySymbol { propertySymbol ->
val filter = accessorSite.toOptionalFilter() val filter = accessorSite.toOptionalFilter()
propertySymbol().hasDeprecatedAnnotation(filter) || propertyAccessorSymbol().hasDeprecatedAnnotation(filter) propertySymbol.hasDeprecatedAnnotation(filter) || propertySymbol.accessorSymbol.hasDeprecatedAnnotation(filter)
} }
} }
@@ -243,7 +241,7 @@ internal class SymbolLightAccessorMethod private constructor(
private val _returnedType: PsiType by lazyPub { private val _returnedType: PsiType by lazyPub {
if (!isGetter) return@lazyPub PsiType.VOID if (!isGetter) return@lazyPub PsiType.VOID
containingPropertySymbolPointer.withSymbol(ktModule) { propertySymbol -> withPropertySymbol { propertySymbol ->
val ktType = propertySymbol.returnType val ktType = propertySymbol.returnType
val forceBoxedReturnType = ktType.isPrimitive && val forceBoxedReturnType = ktType.isPrimitive &&
@@ -289,8 +287,8 @@ internal class SymbolLightAccessorMethod private constructor(
private val _parametersList by lazyPub { private val _parametersList by lazyPub {
val parameterPopulator: (LightParameterListBuilder) -> Unit = if (!isGetter) { val parameterPopulator: (LightParameterListBuilder) -> Unit = if (!isGetter) {
{ builder -> { builder ->
propertyAccessorSymbolPointer.withSymbol(ktModule) { accessorSymbol -> withAccessorSymbol { accessorSymbol ->
val setterParameter = (accessorSymbol as? KtPropertySetterSymbol)?.parameter ?: return@withSymbol val setterParameter = (accessorSymbol as? KtPropertySetterSymbol)?.parameter ?: return@withAccessorSymbol
builder.addParameter( builder.addParameter(
SymbolLightSetterParameter( SymbolLightSetterParameter(
ktAnalysisSession = this, ktAnalysisSession = this,
@@ -321,7 +319,7 @@ internal class SymbolLightAccessorMethod private constructor(
if (isTopLevel) { if (isTopLevel) {
false false
} else { } else {
propertyAccessorSymbolPointer.withSymbol(ktModule) { accessorSymbol -> withAccessorSymbol { accessorSymbol ->
accessorSymbol.isOverride accessorSymbol.isOverride
} }
} }
@@ -332,7 +330,7 @@ internal class SymbolLightAccessorMethod private constructor(
private val _defaultValue: PsiAnnotationMemberValue? by lazyPub { private val _defaultValue: PsiAnnotationMemberValue? by lazyPub {
if (!containingClass.isAnnotationType) return@lazyPub null if (!containingClass.isAnnotationType) return@lazyPub null
containingPropertySymbolPointer.withSymbol(ktModule) { propertySymbol -> withPropertySymbol { propertySymbol ->
when (val initializer = propertySymbol.initializer) { when (val initializer = propertySymbol.initializer) {
is KtConstantInitializerValue -> initializer.constant.createPsiExpression(this@SymbolLightAccessorMethod) is KtConstantInitializerValue -> initializer.constant.createPsiExpression(this@SymbolLightAccessorMethod)
is KtConstantValueForAnnotation -> initializer.annotationValue.toAnnotationMemberValue(this@SymbolLightAccessorMethod) is KtConstantValueForAnnotation -> initializer.annotationValue.toAnnotationMemberValue(this@SymbolLightAccessorMethod)