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

FIR2IR: make source range for implicit invoke call similar to PSI2IR

Browse Source
This commit is contained in:
Mikhail Glukhikh
2023-10-13 13:28:19 +02:00
committed by Space Team
parent fe979cc822
commit f501c3870d
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
+1
View File
@@ -114,6 +114,7 @@ internal inline fun <T : IrElement> FirQualifiedAccessExpression.convertWithOffs
*/ */
fun FirQualifiedAccessExpression.shouldUseCalleeReferenceAsItsSourceInIr(): Boolean { fun FirQualifiedAccessExpression.shouldUseCalleeReferenceAsItsSourceInIr(): Boolean {
return when { return when {
this is FirImplicitInvokeCall -> true
this is FirFunctionCall && origin != FirFunctionCallOrigin.Regular -> false this is FirFunctionCall && origin != FirFunctionCallOrigin.Regular -> false
this is FirCallableReferenceAccess -> false this is FirCallableReferenceAccess -> false
else -> (calleeReference as? FirResolvedNamedReference)?.resolvedSymbol is FirCallableSymbol else -> (calleeReference as? FirResolvedNamedReference)?.resolvedSymbol is FirCallableSymbol
compiler/testData/ir/sourceRanges/extensionLambdaCall.fir.txt
Vendored
+1 -1
View File
@@ -2,6 +2,6 @@
@0:0..3:1 FUN name:lookAtMe visibility:public modality:FINAL <> (f:@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit>) returnType:kotlin.Unit @0:0..3:1 FUN name:lookAtMe visibility:public modality:FINAL <> (f:@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit>) returnType:kotlin.Unit
@0:13..33 VALUE_PARAMETER name:f index:0 type:@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit> @0:13..33 VALUE_PARAMETER name:f index:0 type:@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit>
@0:35..3:1 BLOCK_BODY @0:35..3:1 BLOCK_BODY
@1:4..2:15 CALL 'public abstract fun invoke (p1: P1 of kotlin.Function1): R of kotlin.Function1 [operator] declared in kotlin.Function1' type=kotlin.Unit origin=INVOKE @2:12..15 CALL 'public abstract fun invoke (p1: P1 of kotlin.Function1): R of kotlin.Function1 [operator] declared in kotlin.Function1' type=kotlin.Unit origin=INVOKE
@2:12..13 GET_VAR 'f: @[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit> declared in <root>.lookAtMe' type=@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit> origin=VARIABLE_AS_FUNCTION @2:12..13 GET_VAR 'f: @[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit> declared in <root>.lookAtMe' type=@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit> origin=VARIABLE_AS_FUNCTION
@1:4..9 CONST String type=kotlin.String value="123" @1:4..9 CONST String type=kotlin.String value="123"