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

[Wasm] Do not erase interfaces down to Any type in Wasm signature.

Browse Source 
This enables overloading virtual methods with different interface types
This commit is contained in:
Svyatoslav Kuzmich
2021-09-20 15:41:39 +03:00
parent 6db7154876
commit a2bfcfeae8
13 changed files with 93 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -16802,6 +16802,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/functions/nothisnoclosure.kt");
}
@Test
@TestMetadata("overloadByInterfaceType.kt")
public void testOverloadByInterfaceType() throws Exception {
runTest("compiler/testData/codegen/box/functions/overloadByInterfaceType.kt");
}
@Test
@TestMetadata("prefixRecursiveCall.kt")
public void testPrefixRecursiveCall() throws Exception {
compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt
+2 -2
View File
@@ -255,7 +255,7 @@ class BodyGenerator(val context: WasmFunctionCodegenContext) : IrElementVisitorV
// Processing it separately
if (call.symbol == wasmSymbols.boxIntrinsic) {
val toType = call.getTypeArgument(0)!!
val klass = toType.erasedUpperBound!!
val klass = toType.getRuntimeClass!!
val structTypeName = context.referenceGcType(klass.symbol)
val klassId = context.referenceClassId(klass.symbol)
@@ -332,7 +332,7 @@ class BodyGenerator(val context: WasmFunctionCodegenContext) : IrElementVisitorV
}
private fun generateTypeRTT(type: IrType) {
val rtClass = type.erasedUpperBound?.symbol ?: context.backendContext.irBuiltIns.anyClass
val rtClass = type.getRuntimeClass?.symbol ?: context.backendContext.irBuiltIns.anyClass
body.buildGetGlobal(context.referenceClassRTT(rtClass))
}
compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/TypeTransformer.kt
+6 -3
View File
@@ -47,7 +47,7 @@ class WasmTypeTransformer(
}
fun IrType.toWasmGcRefType(): WasmType =
WasmRefNullType(WasmHeapType.Type(context.referenceGcType(erasedUpperBound?.symbol ?: builtIns.anyClass)))
WasmRefNullType(WasmHeapType.Type(context.referenceGcType(getRuntimeClass?.symbol ?: builtIns.anyClass)))
fun IrType.toBoxedInlineClassType(): WasmType =
toWasmGcRefType()
@@ -111,7 +111,7 @@ class WasmTypeTransformer(
// Return null if upper bound is Any
val IrTypeParameter.erasedUpperBound: IrClass?
private val IrTypeParameter.erasedUpperBound: IrClass?
get() {
// Pick the (necessarily unique) non-interface upper bound if it exists
for (type in superTypes) {
@@ -126,7 +126,10 @@ val IrType.erasedUpperBound: IrClass?
is IrClassSymbol -> classifier.owner
is IrTypeParameterSymbol -> classifier.owner.erasedUpperBound
else -> throw IllegalStateException()
}.let {
}
val IrType.getRuntimeClass: IrClass?
get() = erasedUpperBound.let {
if (it?.isInterface == true) null
else it
}
compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmTypeOperatorLowering.kt
+2 -3
View File
@@ -13,9 +13,8 @@ import org.jetbrains.kotlin.backend.common.lower.at
import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
import org.jetbrains.kotlin.backend.common.lower.irNot
import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
import org.jetbrains.kotlin.backend.wasm.ir2wasm.erasedUpperBound
import org.jetbrains.kotlin.backend.wasm.ir2wasm.getRuntimeClass
import org.jetbrains.kotlin.ir.IrStatement
import org.jetbrains.kotlin.ir.backend.js.utils.findUnitGetInstanceFunction
import org.jetbrains.kotlin.ir.builders.*
import org.jetbrains.kotlin.ir.declarations.IrFile
import org.jetbrains.kotlin.ir.declarations.IrTypeParameter
@@ -100,7 +99,7 @@ class WasmBaseTypeOperatorTransformer(val context: WasmBackendContext) : IrEleme
context.inlineClassesUtils.isTypeInlined(this)
private val IrType.erasedType: IrType
get() = this.erasedUpperBound?.defaultType ?: builtIns.anyType
get() = this.getRuntimeClass?.defaultType ?: builtIns.anyType
private fun generateTypeCheck(
valueProvider: () -> IrExpression,
compiler/testData/codegen/box/bridges/substitutionInSuperClass/differentErasureInSuperClassComplex.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BRIDGE_ISSUES
public open class A<T> {
fun foo(x: T) = "O"
fun foo(x: A<T>) = "K"
compiler/testData/codegen/box/functions/overloadByInterfaceType.kt
Vendored
+35
View File
@@ -0,0 +1,35 @@
interface I1 {
fun o(): String
}
interface I2 {
fun k(): String
}
interface I {
fun foo(x: I1): I1
fun foo(x: I2): I2
}
open class C : I {
override fun foo(x: I1): I1 = x
override fun foo(x: I2): I2 = x
}
class C2 : C() {
override fun foo(x: I1): I1 = x
override fun foo(x: I2): I2 = x
}
fun box(): String {
val x: I = C2()
val o = x.foo(object : I1 {
override fun o(): String = "O"
}).o()
val k = x.foo(object : I2 {
override fun k(): String = "K"
}).k()
return o + k
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -16682,6 +16682,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/functions/nothisnoclosure.kt");
}
@Test
@TestMetadata("overloadByInterfaceType.kt")
public void testOverloadByInterfaceType() throws Exception {
runTest("compiler/testData/codegen/box/functions/overloadByInterfaceType.kt");
}
@Test
@TestMetadata("prefixRecursiveCall.kt")
public void testPrefixRecursiveCall() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -16802,6 +16802,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/functions/nothisnoclosure.kt");
}
@Test
@TestMetadata("overloadByInterfaceType.kt")
public void testOverloadByInterfaceType() throws Exception {
runTest("compiler/testData/codegen/box/functions/overloadByInterfaceType.kt");
}
@Test
@TestMetadata("prefixRecursiveCall.kt")
public void testPrefixRecursiveCall() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -13774,6 +13774,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/functions/nothisnoclosure.kt");
}
@TestMetadata("overloadByInterfaceType.kt")
public void testOverloadByInterfaceType() throws Exception {
runTest("compiler/testData/codegen/box/functions/overloadByInterfaceType.kt");
}
@TestMetadata("prefixRecursiveCall.kt")
public void testPrefixRecursiveCall() throws Exception {
runTest("compiler/testData/codegen/box/functions/prefixRecursiveCall.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
Generated
+5
View File
@@ -12153,6 +12153,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
runTest("compiler/testData/codegen/box/functions/nothisnoclosure.kt");
}
@TestMetadata("overloadByInterfaceType.kt")
public void testOverloadByInterfaceType() throws Exception {
runTest("compiler/testData/codegen/box/functions/overloadByInterfaceType.kt");
}
@TestMetadata("prefixRecursiveCall.kt")
public void testPrefixRecursiveCall() throws Exception {
runTest("compiler/testData/codegen/box/functions/prefixRecursiveCall.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -11559,6 +11559,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/functions/nothisnoclosure.kt");
}
@TestMetadata("overloadByInterfaceType.kt")
public void testOverloadByInterfaceType() throws Exception {
runTest("compiler/testData/codegen/box/functions/overloadByInterfaceType.kt");
}
@TestMetadata("prefixRecursiveCall.kt")
public void testPrefixRecursiveCall() throws Exception {
runTest("compiler/testData/codegen/box/functions/prefixRecursiveCall.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -11539,6 +11539,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/functions/nothisnoclosure.kt");
}
@TestMetadata("overloadByInterfaceType.kt")
public void testOverloadByInterfaceType() throws Exception {
runTest("compiler/testData/codegen/box/functions/overloadByInterfaceType.kt");
}
@TestMetadata("prefixRecursiveCall.kt")
public void testPrefixRecursiveCall() throws Exception {
runTest("compiler/testData/codegen/box/functions/prefixRecursiveCall.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+10
View File
@@ -1295,6 +1295,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/differentErasureInSuperClass.kt");
}
@TestMetadata("differentErasureInSuperClassComplex.kt")
public void testDifferentErasureInSuperClassComplex() throws Exception {
runTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/differentErasureInSuperClassComplex.kt");
}
@TestMetadata("enum.kt")
public void testEnum() throws Exception {
runTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt");
@@ -6628,6 +6633,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/functions/nothisnoclosure.kt");
}
@TestMetadata("overloadByInterfaceType.kt")
public void testOverloadByInterfaceType() throws Exception {
runTest("compiler/testData/codegen/box/functions/overloadByInterfaceType.kt");
}
@TestMetadata("prefixRecursiveCall.kt")
public void testPrefixRecursiveCall() throws Exception {
runTest("compiler/testData/codegen/box/functions/prefixRecursiveCall.kt");