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

[Wasm] Fix invalid boxing for non-primitive typed vararg

Browse Source
This commit is contained in:
Igor Yakovlev
2022-12-07 19:51:43 +01:00
committed by teamcity
parent dc2dcfffee
commit 3be3ae4895
12 changed files with 104 additions and 2 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
@@ -50733,6 +50733,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/vararg/assigningArrayToVarargInAnnotation.kt");
}
@Test
@TestMetadata("boxingArgumentsForVararg.kt")
public void testBoxingArgumentsForVararg() throws Exception {
runTest("compiler/testData/codegen/box/vararg/boxingArgumentsForVararg.kt");
}
@Test
@TestMetadata("doNotCopyImmediatelyCreatedArrays.kt")
public void testDoNotCopyImmediatelyCreatedArrays() throws Exception {
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/AutoboxingTransformer.kt
+9 -1
View File
@@ -114,7 +114,7 @@ abstract class AbstractValueUsageLowering(val context: JsCommonBackendContext) :
if (icUtils.isTypeInlined(element.type) && !icUtils.isTypeInlined(expression.type) && !expression.type.isPrimitiveArray())
irBuiltIns.anyNType
else
expression.varargElementType
if (!expression.type.isPrimitiveArray()) irBuiltIns.anyNType else expression.varargElementType
)
}
@@ -136,6 +136,14 @@ class AutoboxingTransformer(context: JsCommonBackendContext) : AbstractValueUsag
return res
}
override fun visitFunction(declaration: IrFunction): IrStatement {
return super.visitFunction(declaration)
}
override fun visitVararg(expression: IrVararg): IrExpression {
return super.visitVararg(expression)
}
override fun IrExpression.useAsResult(enclosing: IrExpression): IrExpression {
if (processingReturnStack.lastOrNull()?.value == enclosing && enclosing is IrReturnableBlock) {
return useReturnableExpressionAsType(enclosing.type)
compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmTypeOperatorLowering.kt
+3 -1
View File
@@ -36,7 +36,9 @@ class WasmBaseTypeOperatorTransformer(val context: WasmBackendContext) : IrEleme
private val builtIns = context.irBuiltIns
private lateinit var builder: DeclarationIrBuilder
override fun visitSimpleFunction(declaration: IrSimpleFunction): IrStatement {
return super.visitSimpleFunction(declaration)
}
override fun visitTypeOperator(expression: IrTypeOperatorCall): IrExpression {
super.visitTypeOperator(expression)
builder = context.createIrBuilder(currentScope!!.scope.scopeOwnerSymbol).at(expression)
compiler/testData/codegen/box/vararg/boxingArgumentsForVararg.kt
Vendored
+40
View File
@@ -0,0 +1,40 @@
fun <T> anyVararg(vararg x: T): Boolean = x[0] == 123f
fun boxingNullablePrimitiveToAny(x: Float?): Boolean {
if (x !== null) {
return anyVararg(x)
}
return false
}
fun boxingPrimitiveToAny(x: Float): Boolean =
anyVararg(x)
fun primitiveVararg(vararg x: Float): Boolean = x[0] == 123f
fun unboxingNullablePrimitiveToPrimitive(x: Float?): Boolean {
if (x !== null) {
return primitiveVararg(x)
}
return false
}
fun noBoxingPrimitiveToPrimitive(x: Float): Boolean =
primitiveVararg(x)
inline class InlineClass(val x: Float)
fun <T : InlineClass> valueClassAnyVararg(vararg x: T): Boolean = x[0].x == 123f
fun boxingInlineClassToAny(x: InlineClass): Boolean =
valueClassAnyVararg(x)
fun box(): String {
if (!boxingNullablePrimitiveToAny(123f)) return "Fail1"
if (!boxingPrimitiveToAny(123f)) return "Fail2"
if (!unboxingNullablePrimitiveToPrimitive(123f)) return "Fail3"
if (!noBoxingPrimitiveToPrimitive(123f)) return "Fail4"
if (!boxingInlineClassToAny(InlineClass(123f))) return "Fail5"
return "OK"
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -48741,6 +48741,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/vararg/assigningArrayToVarargInAnnotation.kt");
}
@Test
@TestMetadata("boxingArgumentsForVararg.kt")
public void testBoxingArgumentsForVararg() throws Exception {
runTest("compiler/testData/codegen/box/vararg/boxingArgumentsForVararg.kt");
}
@Test
@TestMetadata("doNotCopyImmediatelyCreatedArrays.kt")
public void testDoNotCopyImmediatelyCreatedArrays() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -50733,6 +50733,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/vararg/assigningArrayToVarargInAnnotation.kt");
}
@Test
@TestMetadata("boxingArgumentsForVararg.kt")
public void testBoxingArgumentsForVararg() throws Exception {
runTest("compiler/testData/codegen/box/vararg/boxingArgumentsForVararg.kt");
}
@Test
@TestMetadata("doNotCopyImmediatelyCreatedArrays.kt")
public void testDoNotCopyImmediatelyCreatedArrays() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -39600,6 +39600,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/vararg/assigningArrayToVarargInAnnotation.kt");
}
@TestMetadata("boxingArgumentsForVararg.kt")
public void testBoxingArgumentsForVararg() throws Exception {
runTest("compiler/testData/codegen/box/vararg/boxingArgumentsForVararg.kt");
}
@TestMetadata("doNotCopyImmediatelyCreatedArrays.kt")
public void testDoNotCopyImmediatelyCreatedArrays() throws Exception {
runTest("compiler/testData/codegen/box/vararg/doNotCopyImmediatelyCreatedArrays.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -36227,6 +36227,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/vararg"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true);
}
@Test
@TestMetadata("boxingArgumentsForVararg.kt")
public void testBoxingArgumentsForVararg() throws Exception {
runTest("compiler/testData/codegen/box/vararg/boxingArgumentsForVararg.kt");
}
@Test
@TestMetadata("doNotCopyImmediatelyCreatedArrays.kt")
public void testDoNotCopyImmediatelyCreatedArrays() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -36407,6 +36407,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/vararg"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
}
@Test
@TestMetadata("boxingArgumentsForVararg.kt")
public void testBoxingArgumentsForVararg() throws Exception {
runTest("compiler/testData/codegen/box/vararg/boxingArgumentsForVararg.kt");
}
@Test
@TestMetadata("doNotCopyImmediatelyCreatedArrays.kt")
public void testDoNotCopyImmediatelyCreatedArrays() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -36407,6 +36407,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/vararg"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
}
@Test
@TestMetadata("boxingArgumentsForVararg.kt")
public void testBoxingArgumentsForVararg() throws Exception {
runTest("compiler/testData/codegen/box/vararg/boxingArgumentsForVararg.kt");
}
@Test
@TestMetadata("doNotCopyImmediatelyCreatedArrays.kt")
public void testDoNotCopyImmediatelyCreatedArrays() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -32610,6 +32610,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/vararg"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
}
@TestMetadata("boxingArgumentsForVararg.kt")
public void testBoxingArgumentsForVararg() throws Exception {
runTest("compiler/testData/codegen/box/vararg/boxingArgumentsForVararg.kt");
}
@TestMetadata("doNotCopyImmediatelyCreatedArrays.kt")
public void testDoNotCopyImmediatelyCreatedArrays() throws Exception {
runTest("compiler/testData/codegen/box/vararg/doNotCopyImmediatelyCreatedArrays.kt");
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -39552,6 +39552,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/vararg"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
}
@Test
@TestMetadata("boxingArgumentsForVararg.kt")
public void testBoxingArgumentsForVararg() throws Exception {
runTest("compiler/testData/codegen/box/vararg/boxingArgumentsForVararg.kt");
}
@Test
@TestMetadata("doNotCopyImmediatelyCreatedArrays.kt")
public void testDoNotCopyImmediatelyCreatedArrays() throws Exception {