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

[PL] Special handling of function references produced by FIR

Browse Source
This commit is contained in:
Dmitriy Dolovov
2023-03-27 18:20:45 +02:00
committed by Space Team
parent 85b5a4521e
commit 850879375a
3 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/PartiallyLinkedIrTreePatcher.kt
+23 -1
View File
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.ir.symbols.*
import org.jetbrains.kotlin.ir.symbols.impl.IrAnonymousInitializerSymbolImpl
import org.jetbrains.kotlin.ir.types.IrSimpleType
import org.jetbrains.kotlin.ir.types.IrType
import org.jetbrains.kotlin.ir.types.isSubtypeOfClass
import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
@@ -716,7 +717,28 @@ internal class PartiallyLinkedIrTreePatcher(
val actualDispatchReceiverClassifier: IrClassifierSymbol? =
(referenceType.arguments.firstOrNull() as? IrSimpleType)?.classifier
expectedDispatchReceiverClassifier == actualDispatchReceiverClassifier
/*
* FIR generates function references for certain overridden functions in a different way than K1. Example:
* class A
*
* fun test(a: A): Boolean {
* return (A::equals)(a, a)
* // ^^^ IrFunctionReferenceImpl slightly differs:
* // | Frontend | Attribute | Value |
* // +----------+--------------------------+--------------------------------+
* // | K1 | dispatchReceiver | null |
* // | K1 | symbol.parent as IrClass | "class A" |
* // | K1 | type as IrSimpleType | "KFunction2<A, Any?, Boolean>" |
* // | FIR | dispatchReceiver | null |
* // | FIR | symbol.parent as IrClass | "class Any" |
* // | FIR | type as IrSimpleType | "KFunction2<A, Any?, Boolean>" |
* }
*
* So instead of checking that `expectedDispatchReceiverClassifier == actualDispatchReceiverClassifier` it's
* safer to check that `actualDispatchReceiverClassifier` is the same or subclass of `expectedDispatchReceiverClassifier`.
*/
// expectedDispatchReceiverClassifier == actualDispatchReceiverClassifier
actualDispatchReceiverClassifier?.isSubtypeOfClass(expectedDispatchReceiverClassifier) ?: false
}
else -> false
}