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

Fix IteratorNext intrinsic to cast its dispatch receiver to

Browse Source 
the expected type.

^KT-47741 Fixed.
This commit is contained in:
Mads Ager
2021-07-15 14:51:09 +02:00
committed by Alexander Udalov
parent f83cc69379
commit b51ff799cb
10 changed files with 51 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
@@ -3465,6 +3465,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/callableReference/function/kt32462.kt");
}
@Test
@TestMetadata("kt47741.kt")
public void testKt47741() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/function/kt47741.kt");
}
@Test
@TestMetadata("nestedConstructorFromClass.kt")
public void testNestedConstructorFromClass() throws Exception {
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IteratorNext.kt
+2 -2
View File
@@ -33,8 +33,8 @@ object IteratorNext : IntrinsicMethod() {
// If the array element type is unboxed primitive, do not unbox. Otherwise AsmUtil.unbox throws exception
val type = if (AsmUtil.isBoxedPrimitiveType(signature.returnType)) AsmUtil.unboxType(signature.returnType) else signature.returnType
val newSignature = signature.newReturnType(type)
return IrIntrinsicFunction.create(expression, newSignature, context, AsmTypes.OBJECT_TYPE) {
val primitiveClassName = getKotlinPrimitiveClassName(type)
val primitiveClassName = getKotlinPrimitiveClassName(type)
return IrIntrinsicFunction.create(expression, newSignature, context, getPrimitiveIteratorType(primitiveClassName)) {
it.invokevirtual(
getPrimitiveIteratorType(primitiveClassName).internalName,
"next${primitiveClassName.asString()}",
compiler/testData/codegen/box/callableReference/function/kt47741.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
// IGNORE_BACKEND: WASM
fun box(): String {
val generateId = (1 .. Int.MAX_VALUE).iterator()::next
return if (generateId() == 1) "OK" else "FAIL"
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -3465,6 +3465,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/callableReference/function/kt32462.kt");
}
@Test
@TestMetadata("kt47741.kt")
public void testKt47741() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/function/kt47741.kt");
}
@Test
@TestMetadata("nestedConstructorFromClass.kt")
public void testNestedConstructorFromClass() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -3465,6 +3465,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/callableReference/function/kt32462.kt");
}
@Test
@TestMetadata("kt47741.kt")
public void testKt47741() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/function/kt47741.kt");
}
@Test
@TestMetadata("nestedConstructorFromClass.kt")
public void testNestedConstructorFromClass() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -3027,6 +3027,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/callableReference/function/kt32462.kt");
}
@TestMetadata("kt47741.kt")
public void testKt47741() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/function/kt47741.kt");
}
@TestMetadata("nestedConstructorFromClass.kt")
public void testNestedConstructorFromClass() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/function/nestedConstructorFromClass.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
Generated
+5
View File
@@ -2192,6 +2192,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
runTest("compiler/testData/codegen/box/callableReference/function/kt32462.kt");
}
@TestMetadata("kt47741.kt")
public void testKt47741() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/function/kt47741.kt");
}
@TestMetadata("nestedConstructorFromClass.kt")
public void testNestedConstructorFromClass() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/function/nestedConstructorFromClass.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -2192,6 +2192,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/callableReference/function/kt32462.kt");
}
@TestMetadata("kt47741.kt")
public void testKt47741() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/function/kt47741.kt");
}
@TestMetadata("nestedConstructorFromClass.kt")
public void testNestedConstructorFromClass() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/function/nestedConstructorFromClass.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -2192,6 +2192,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/callableReference/function/kt32462.kt");
}
@TestMetadata("kt47741.kt")
public void testKt47741() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/function/kt47741.kt");
}
@TestMetadata("nestedConstructorFromClass.kt")
public void testNestedConstructorFromClass() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/function/nestedConstructorFromClass.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -1622,6 +1622,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/callableReference/function/kt32462.kt");
}
@TestMetadata("kt47741.kt")
public void testKt47741() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/function/kt47741.kt");
}
@TestMetadata("nestedConstructorFromClass.kt")
public void testNestedConstructorFromClass() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/function/nestedConstructorFromClass.kt");