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

Add cast to expected type in call-based in-expression generation

Browse Source 
#KT-20106 Fixed
This commit is contained in:
Dmitry Petrov
2017-09-05 11:42:03 +03:00
parent 081b732070
commit 21cdf9dd5b
6 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator.kt
+1
View File
@@ -39,6 +39,7 @@ class CallBasedInExpressionGenerator(
object : BranchedValue(argument, null, argument.type, Opcodes.IFEQ) {
override fun putSelector(type: Type, v: InstructionAdapter) {
invokeFunction(v)
coerceTo(type, v)
}
override fun condJump(jumpLabel: Label, v: InstructionAdapter, jumpIfFalse: Boolean) {
compiler/testData/codegen/box/ranges/contains/kt20106.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
// WITH_RUNTIME
fun box(): String {
val strSet = setOf("a", "b")
val xx = "a" to ("a" in strSet)
return if (!xx.second) "fail" else "OK"
}
compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
+6
View File
@@ -13777,6 +13777,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
doTest(fileName);
}
@TestMetadata("kt20106.kt")
public void testKt20106() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/ranges/contains/kt20106.kt");
doTest(fileName);
}
@TestMetadata("nullableInPrimitiveRange.kt")
public void testNullableInPrimitiveRange() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/ranges/contains/nullableInPrimitiveRange.kt");
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
+6
View File
@@ -13777,6 +13777,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
doTest(fileName);
}
@TestMetadata("kt20106.kt")
public void testKt20106() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/ranges/contains/kt20106.kt");
doTest(fileName);
}
@TestMetadata("nullableInPrimitiveRange.kt")
public void testNullableInPrimitiveRange() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/ranges/contains/nullableInPrimitiveRange.kt");
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
+6
View File
@@ -13777,6 +13777,12 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
doTest(fileName);
}
@TestMetadata("kt20106.kt")
public void testKt20106() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/ranges/contains/kt20106.kt");
doTest(fileName);
}
@TestMetadata("nullableInPrimitiveRange.kt")
public void testNullableInPrimitiveRange() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/ranges/contains/nullableInPrimitiveRange.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
+6
View File
@@ -15463,6 +15463,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
doTest(fileName);
}
@TestMetadata("kt20106.kt")
public void testKt20106() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/ranges/contains/kt20106.kt");
doTest(fileName);
}
@TestMetadata("nullableInPrimitiveRange.kt")
public void testNullableInPrimitiveRange() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/ranges/contains/nullableInPrimitiveRange.kt");