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

[IR] Resolve fake overrides inside getFunctionDeclaration function

Browse Source 
#KT-64807
This commit is contained in:
Ivan Kylchik
2024-02-19 19:05:48 +01:00
committed by Space Team
parent 2bfd1c8f23
commit 9e7ddfa191
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.inline/src/org/jetbrains/kotlin/ir/inline/FunctionInlining.kt
+4 -3
View File
@@ -41,7 +41,9 @@ import org.jetbrains.kotlin.util.OperatorNameConventions
abstract class InlineFunctionResolver { abstract class InlineFunctionResolver {
open fun getFunctionDeclaration(symbol: IrFunctionSymbol): IrFunction? { open fun getFunctionDeclaration(symbol: IrFunctionSymbol): IrFunction? {
if (shouldExcludeFunctionFromInlining(symbol)) return null if (shouldExcludeFunctionFromInlining(symbol)) return null
return symbol.owner
val owner = symbol.owner
return (owner as? IrSimpleFunction)?.resolveFakeOverride() ?: owner
} }
protected open fun shouldExcludeFunctionFromInlining(symbol: IrFunctionSymbol): Boolean { protected open fun shouldExcludeFunctionFromInlining(symbol: IrFunctionSymbol): Boolean {
@@ -108,8 +110,7 @@ class FunctionInlining(
if (!callee.needsInlining) if (!callee.needsInlining)
return expression return expression
val target = (callee as? IrSimpleFunction)?.resolveFakeOverride() ?: callee val actualCallee = inlineFunctionResolver.getFunctionDeclaration(callee.symbol)
val actualCallee = inlineFunctionResolver.getFunctionDeclaration(target.symbol)
if (actualCallee?.body == null) { if (actualCallee?.body == null) {
return expression return expression
} }