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

JVM_IR: check for null when converting unboxed inline classes to strings

Browse Source 
`C?` can be unboxed into `T?` if if wraps a reference type `T!!`, but in
this case `null` is not a valid value to pass to `toString-impl`.

 #KT-42005 Fixed
This commit is contained in:
pyos
2020-09-24 16:21:39 +02:00
committed by Alexander Udalov
parent d2bdab2ef5
commit bd6ead0467
14 changed files with 125 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
Generated
+5
View File
@@ -15372,6 +15372,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/inlineClasses/toStringCallingPrivateFun.kt");
}
@TestMetadata("toStringOfUnboxedNullable.kt")
public void testToStringOfUnboxedNullable() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/toStringOfUnboxedNullable.kt");
}
@TestMetadata("typeChecksForInlineClasses.kt")
public void testTypeChecksForInlineClasses() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/typeChecksForInlineClasses.kt");
compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
Generated
+8 -3
View File
@@ -3192,9 +3192,14 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/suspendFunctionMangling.kt");
}
@TestMetadata("toStringIsCalledByInlineClass.kt")
public void testToStringIsCalledByInlineClass() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/toStringIsCalledByInlineClass.kt");
@TestMetadata("toStringOfInlineClassValue.kt")
public void testToStringOfInlineClassValue() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/toStringOfInlineClassValue.kt");
}
@TestMetadata("toStringOfReferenceInlineClassValue.kt")
public void testToStringOfReferenceInlineClassValue() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/toStringOfReferenceInlineClassValue.kt");
}
@TestMetadata("uIntArrayIteratorWithoutBoxing.kt")
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -14669,6 +14669,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/inlineClasses/simpleSecondaryConstructor.kt");
}
@TestMetadata("toStringOfUnboxedNullable.kt")
public void ignoreToStringOfUnboxedNullable() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/toStringOfUnboxedNullable.kt");
}
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
}
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
Generated
+5
View File
@@ -13977,6 +13977,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/inlineClasses/toStringCallingPrivateFun.kt");
}
@TestMetadata("toStringOfUnboxedNullable.kt")
public void testToStringOfUnboxedNullable() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/toStringOfUnboxedNullable.kt");
}
@TestMetadata("typeChecksForInlineClasses.kt")
public void testTypeChecksForInlineClasses() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/typeChecksForInlineClasses.kt");
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java
Generated
+8 -3
View File
@@ -3287,9 +3287,14 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/suspendFunctionMangling.kt");
}
@TestMetadata("toStringIsCalledByInlineClass.kt")
public void testToStringIsCalledByInlineClass() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/toStringIsCalledByInlineClass.kt");
@TestMetadata("toStringOfInlineClassValue.kt")
public void testToStringOfInlineClassValue() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/toStringOfInlineClassValue.kt");
}
@TestMetadata("toStringOfReferenceInlineClassValue.kt")
public void testToStringOfReferenceInlineClassValue() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/toStringOfReferenceInlineClassValue.kt");
}
@TestMetadata("uIntArrayIteratorWithoutBoxing.kt")