[K/Wasm] Rework Wasm enumEntriesIntrinsic declaration to fix stdlib compilation
This commit is contained in:
+4
-5
@@ -45,6 +45,9 @@ fun IrExpression.isAdaptedFunctionReference() =
|
||||
interface InlineFunctionResolver {
|
||||
fun getFunctionDeclaration(symbol: IrFunctionSymbol): IrFunction
|
||||
fun getFunctionSymbol(irFunction: IrFunction): IrFunctionSymbol
|
||||
fun shouldExcludeFunctionFromInlining(symbol: IrFunctionSymbol): Boolean {
|
||||
return Symbols.isLateinitIsInitializedPropertyGetter(symbol) || Symbols.isTypeOfIntrinsic(symbol)
|
||||
}
|
||||
}
|
||||
|
||||
fun IrFunction.isTopLevelInPackage(name: String, packageName: String): Boolean {
|
||||
@@ -112,11 +115,7 @@ class FunctionInlining(
|
||||
is IrConstructorCall -> expression.symbol.owner
|
||||
else -> return expression
|
||||
}
|
||||
if (!callee.needsInlining)
|
||||
return expression
|
||||
if (Symbols.isLateinitIsInitializedPropertyGetter(callee.symbol))
|
||||
return expression
|
||||
if (Symbols.isTypeOfIntrinsic(callee.symbol))
|
||||
if (!callee.needsInlining || inlineFunctionResolver.shouldExcludeFunctionFromInlining(callee.symbol))
|
||||
return expression
|
||||
|
||||
val actualCallee = inlineFunctionResolver.getFunctionDeclaration(callee.symbol)
|
||||
|
||||
+5
-2
@@ -33,10 +33,13 @@ internal class JsInlineFunctionResolver(context: JsIrBackendContext) : DefaultIn
|
||||
private val inlineFunctionsBeforeInlining = context.mapping.inlineFunctionsBeforeInlining
|
||||
private val inlineFunctionsBeforeInliningSymbols = hashMapOf<IrFunction, IrFunctionSymbol>()
|
||||
|
||||
override fun shouldExcludeFunctionFromInlining(symbol: IrFunctionSymbol): Boolean {
|
||||
// TODO: After the expect fun enumEntriesIntrinsic become non-inline function, the code will be removed
|
||||
return symbol == enumEntriesIntrinsic || super.shouldExcludeFunctionFromInlining(symbol)
|
||||
}
|
||||
|
||||
override fun getFunctionDeclaration(symbol: IrFunctionSymbol): IrFunction {
|
||||
val function = super.getFunctionDeclaration(symbol)
|
||||
// TODO: After the expect fun enumEntriesIntrinsic become non-inline function, the code will be removed
|
||||
if (function.symbol == enumEntriesIntrinsic) return function.apply { body = null }
|
||||
val functionBeforeInlining = inlineFunctionsBeforeInlining[function] ?: return function
|
||||
inlineFunctionsBeforeInliningSymbols[functionBeforeInlining] = function.symbol
|
||||
return functionBeforeInlining
|
||||
|
||||
@@ -169,6 +169,7 @@ private val functionInliningPhase = makeCustomWasmModulePhase(
|
||||
FunctionInlining(
|
||||
context = context,
|
||||
innerClassesSupport = context.innerClassesSupport,
|
||||
inlineFunctionResolver = WasmInlineFunctionResolver(context),
|
||||
insertAdditionalImplicitCasts = true,
|
||||
).inline(module)
|
||||
module.patchDeclarationParents()
|
||||
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
/*
|
||||
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
|
||||
package org.jetbrains.kotlin.backend.wasm.lower
|
||||
|
||||
import org.jetbrains.kotlin.backend.common.lower.inline.DefaultInlineFunctionResolver
|
||||
import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
|
||||
import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol
|
||||
|
||||
class WasmInlineFunctionResolver(context: WasmBackendContext) : DefaultInlineFunctionResolver(context) {
|
||||
private val enumEntriesIntrinsic = context.wasmSymbols.enumEntriesIntrinsic
|
||||
|
||||
override fun shouldExcludeFunctionFromInlining(symbol: IrFunctionSymbol): Boolean {
|
||||
// TODO: After the expect fun enumEntriesIntrinsic become non-inline function, the code will be removed
|
||||
return symbol == enumEntriesIntrinsic || super.shouldExcludeFunctionFromInlining(symbol)
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,10 @@ package kotlin.enums
|
||||
@SinceKotlin("1.9")
|
||||
@ExperimentalStdlibApi
|
||||
@PublishedApi
|
||||
// TODO: After the expect fun enumEntriesIntrinsic become non-inline function, the suppress and external keyword should be removed
|
||||
@Suppress("INLINE_EXTERNAL_DECLARATION", "WRONG_JS_INTEROP_TYPE")
|
||||
internal actual external inline fun <reified T : Enum<T>> enumEntriesIntrinsic(): EnumEntries<T>
|
||||
internal actual inline fun <reified T : Enum<T>> enumEntriesIntrinsic(): EnumEntries<T> {
|
||||
/*
|
||||
* Implementation note: this body will be replaced with `throw NotImplementedException()` the moment
|
||||
* all backends starts intrinsifying this call.
|
||||
*/
|
||||
return enumEntries(enumValues<T>())
|
||||
}
|
||||
Reference in New Issue
Block a user