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

[JS IR] Fix inline functions call graph in IC

Browse Source 
Add a dependency for inline function references,
 because in some cases the references may be inlined.

^KT-55144 Fixed
This commit is contained in:
Alexander Korepanov
2022-11-25 17:51:51 +01:00
committed by Space Team
parent c31705240a
commit d8ab9498ab
28 changed files with 237 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/ic/IdSignatureHashCalculator.kt
+4 -11
View File
@@ -53,9 +53,9 @@ internal class IdSignatureHashCalculator {
}
private inner class InlineFunctionCallGraphBuilder : IrElementVisitor<Unit, MutableSet<IrFunction>> {
var inlineFunctionCallDepth: Int = 0
override fun visitElement(element: IrElement, data: MutableSet<IrFunction>) = element.acceptChildren(this, data)
override fun visitElement(element: IrElement, data: MutableSet<IrFunction>) {
element.acceptChildren(this, data)
}
override fun visitSimpleFunction(declaration: IrSimpleFunction, data: MutableSet<IrFunction>) {
if (declaration in inlineFunctionCallGraph) {
@@ -70,20 +70,13 @@ internal class IdSignatureHashCalculator {
val callee = expression.symbol.owner
if (callee.isInline) {
data += callee
inlineFunctionCallDepth += 1
}
expression.acceptChildren(this, data)
if (callee.isInline) {
inlineFunctionCallDepth -= 1
if (inlineFunctionCallDepth < 0) {
icError("inline function calls depth inconsistent")
}
}
}
override fun visitFunctionReference(expression: IrFunctionReference, data: MutableSet<IrFunction>) {
val reference = expression.symbol.owner
if (inlineFunctionCallDepth > 0 && reference.isInline) {
if (reference.isInline) {
// this if is fine, because fake overrides are not inlined as function reference calls even as inline function args
if (!reference.isFakeOverride) {
data += reference