Skip to content

Commit 3db61ef

Browse files
committed
[K/JS] Revert KT-60785 fix because the 1.9.0 contains old schema for functions inlining
This reverts commit b925404.
1 parent 3584af4 commit 3db61ef

File tree

7 files changed

+4
-77
lines changed

7 files changed

+4
-77
lines changed

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ private val inlineClassUsageLoweringPhase = makeBodyLoweringPhase(
727727
)
728728

729729
private val autoboxingTransformerPhase = makeBodyLoweringPhase(
730-
{ AutoboxingTransformer(it, shouldCalculateActualTypeForInlinedFunction = true) },
730+
::AutoboxingTransformer,
731731
name = "AutoboxingTransformer",
732732
description = "Insert box/unbox intrinsics"
733733
)

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/AutoboxingTransformer.kt

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ import org.jetbrains.kotlin.ir.util.render
3131

3232
// Copied and adapted from Kotlin/Native
3333

34-
abstract class AbstractValueUsageLowering(
35-
val context: JsCommonBackendContext,
36-
private val shouldCalculateActualTypeForInlinedFunction: Boolean = false
37-
) : AbstractValueUsageTransformer(context.irBuiltIns),
34+
abstract class AbstractValueUsageLowering(val context: JsCommonBackendContext) : AbstractValueUsageTransformer(context.irBuiltIns),
3835
BodyLoweringPass {
3936

4037
val icUtils = context.inlineClassesUtils
@@ -55,19 +52,11 @@ abstract class AbstractValueUsageLowering(
5552

5653
abstract fun IrExpression.useExpressionAsType(actualType: IrType, expectedType: IrType): IrExpression
5754

58-
protected fun IrExpression.getActualType(): IrType = when (this) {
55+
protected fun IrExpression.getActualType() = when (this) {
5956
is IrConstructorCall -> symbol.owner.returnType
6057
is IrCall -> symbol.owner.realOverrideTarget.returnType
6158
is IrGetField -> this.symbol.owner.type
6259

63-
is IrInlinedFunctionBlock -> {
64-
if (shouldCalculateActualTypeForInlinedFunction) {
65-
inlineCall.getActualType()
66-
} else {
67-
this.type
68-
}
69-
}
70-
7160
is IrTypeOperatorCall -> {
7261
if (operator == IrTypeOperator.REINTERPRET_CAST) {
7362
this.typeOperand
@@ -131,10 +120,7 @@ abstract class AbstractValueUsageLowering(
131120
)
132121
}
133122

134-
class AutoboxingTransformer(
135-
context: JsCommonBackendContext,
136-
shouldCalculateActualTypeForInlinedFunction: Boolean = false
137-
) : AbstractValueUsageLowering(context, shouldCalculateActualTypeForInlinedFunction) {
123+
class AutoboxingTransformer(context: JsCommonBackendContext) : AbstractValueUsageLowering(context) {
138124
private var processingReturnStack = mutableListOf<IrReturn>()
139125

140126
private fun IrExpression.useReturnableExpressionAsType(expectedType: IrType): IrExpression {

js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/BoxJsTestGenerated.java

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsBoxTestGenerated.java

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrBoxJsES6TestGenerated.java

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrBoxJsTestGenerated.java

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/js.translator/testData/box/coroutines/boxingUnboxingInsideTheSuspendFunction.kt

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)