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

[FIR2IR] Minor: reuse calculated expression

Browse Source
This commit is contained in:
Ivan Kochurkin
2021-12-02 23:42:28 +03:00
committed by Space
parent 522d2064bb
commit fa41e0f5a9
3 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt
+5 -5
View File
@@ -517,21 +517,21 @@ class ExpressionsConverter(
var firSelector: FirExpression? = null var firSelector: FirExpression? = null
var firReceiver: FirExpression? = null //before dot var firReceiver: FirExpression? = null //before dot
dotQualifiedExpression.forEachChildren { dotQualifiedExpression.forEachChildren {
when (it.tokenType) { when (val tokenType = it.tokenType) {
DOT -> isSelector = true DOT -> isSelector = true
SAFE_ACCESS -> { SAFE_ACCESS -> {
isSafe = true isSafe = true
isSelector = true isSelector = true
} }
else -> { else -> {
val isEffectiveSelector = isSelector && it.tokenType != TokenType.ERROR_ELEMENT val isEffectiveSelector = isSelector && tokenType != TokenType.ERROR_ELEMENT
val firExpression = val firExpression =
getAsFirExpression<FirExpression>(it, "Incorrect ${if (isEffectiveSelector) "selector" else "receiver"} expression") getAsFirExpression<FirExpression>(it, "Incorrect ${if (isEffectiveSelector) "selector" else "receiver"} expression")
if (isEffectiveSelector) { if (isEffectiveSelector) {
val callExpressionCallee = if (it.tokenType == CALL_EXPRESSION) it.getFirstChildExpressionUnwrapped() else null val callExpressionCallee = if (tokenType == CALL_EXPRESSION) it.getFirstChildExpressionUnwrapped() else null
firSelector = firSelector =
if (it.tokenType is KtNameReferenceExpressionElementType || if (tokenType is KtNameReferenceExpressionElementType ||
(it.tokenType == CALL_EXPRESSION && callExpressionCallee?.tokenType != LAMBDA_EXPRESSION) (tokenType == CALL_EXPRESSION && callExpressionCallee?.tokenType != LAMBDA_EXPRESSION)
) { ) {
firExpression firExpression
} else { } else {
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/VisibilityUtils.kt
+5 -9
View File
@@ -69,14 +69,10 @@ private fun FirMemberDeclaration.getBackingFieldIfApplicable(): FirBackingField?
// This check prevents resolving protected and // This check prevents resolving protected and
// public fields. // public fields.
val visibility = field.visibility return when (field.visibility) {
if ( Visibilities.PrivateToThis,
visibility == Visibilities.PrivateToThis || Visibilities.Private,
visibility == Visibilities.Private || Visibilities.Internal -> field
visibility == Visibilities.Internal else -> null
) {
return field
} }
return null
} }
compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/PropertyReferenceLowering.kt
+4 -3
View File
@@ -166,10 +166,11 @@ internal class PropertyReferenceLowering(val context: JvmBackendContext) : IrEle
private fun propertyReferenceKind(expression: IrCallableReference<*>, mutable: Boolean, i: Int): PropertyReferenceKind { private fun propertyReferenceKind(expression: IrCallableReference<*>, mutable: Boolean, i: Int): PropertyReferenceKind {
check(i in 0..2) { "Incorrect number of receivers ($i) for property reference: ${expression.render()}" } check(i in 0..2) { "Incorrect number of receivers ($i) for property reference: ${expression.render()}" }
val symbols = context.ir.symbols
return PropertyReferenceKind( return PropertyReferenceKind(
context.ir.symbols.getPropertyReferenceClass(mutable, i, false), symbols.getPropertyReferenceClass(mutable, i, false),
context.ir.symbols.getPropertyReferenceClass(mutable, i, true), symbols.getPropertyReferenceClass(mutable, i, true),
context.ir.symbols.reflection.owner.functions.single { symbols.reflection.owner.functions.single {
it.name.asString() == (if (mutable) "mutableProperty$i" else "property$i") it.name.asString() == (if (mutable) "mutableProperty$i" else "property$i")
} }
) )