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

[K/JS] Allow declare inline functions inside external declarations with a million suppresses ^KT-48154 Fixed

Browse Source
This commit is contained in:
Artem Kobzar
2023-04-13 08:53:57 +00:00
committed by Space Team
parent 09bccd272d
commit c695da1bed
7 changed files with 56 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/FunctionInlining.kt
+2 -1
View File
@@ -90,6 +90,7 @@ class FunctionInlining(
private val inlinePureArguments: Boolean = true,
private val regenerateInlinedAnonymousObjects: Boolean = false,
private val inlineArgumentsWithTheirOriginalTypeAndOffset: Boolean = false,
private val allowExternalInlining: Boolean = false
) : IrElementTransformerVoidWithContext(), BodyLoweringPass {
private var containerScope: ScopeWithIr? = null
@@ -153,7 +154,7 @@ class FunctionInlining(
return this
}
private val IrFunction.needsInlining get() = this.isInline && !this.isExternal
private val IrFunction.needsInlining get() = this.isInline && (allowExternalInlining || !this.isExternal)
private inner class Inliner(
val callSite: IrFunctionAccessExpression,
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt
+4 -2
View File
@@ -20,7 +20,9 @@ import org.jetbrains.kotlin.ir.backend.js.codegen.JsGenerationGranularity
import org.jetbrains.kotlin.ir.backend.js.lower.*
import org.jetbrains.kotlin.ir.backend.js.lower.calls.CallsLowering
import org.jetbrains.kotlin.ir.backend.js.lower.cleanup.CleanupLowering
import org.jetbrains.kotlin.ir.backend.js.lower.coroutines.*
import org.jetbrains.kotlin.ir.backend.js.lower.coroutines.AddContinuationToFunctionCallsLowering
import org.jetbrains.kotlin.ir.backend.js.lower.coroutines.JsSuspendArityStoreLowering
import org.jetbrains.kotlin.ir.backend.js.lower.coroutines.JsSuspendFunctionsLowering
import org.jetbrains.kotlin.ir.backend.js.lower.inline.*
import org.jetbrains.kotlin.ir.declarations.IrFile
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
@@ -278,7 +280,7 @@ private val saveInlineFunctionsBeforeInlining = makeDeclarationTransformerPhase(
)
private val functionInliningPhase = makeBodyLoweringPhase(
{ FunctionInlining(it, JsInlineFunctionResolver(it), it.innerClassesSupport) },
{ FunctionInlining(it, JsInlineFunctionResolver(it), it.innerClassesSupport, allowExternalInlining = true) },
name = "FunctionInliningPhase",
description = "Perform function inlining",
prerequisite = setOf(saveInlineFunctionsBeforeInlining)