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

Fix inline class coercion in default parameter values

Browse Source 
#KT-27358
This commit is contained in:
Dmitry Petrov
2018-10-02 17:32:53 +03:00
parent c2315f065a
commit 8ce1d09f8a
10 changed files with 183 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
+2 -1
View File
@@ -1266,7 +1266,8 @@ public class FunctionCodegen {
Label loadArg = new Label();
iv.ifeq(loadArg);
StackValue.local(parameterIndex, type).store(loadStrategy.genValue(parameterDescriptor, codegen), iv);
StackValue.local(parameterIndex, type, parameterDescriptor.getType())
.store(loadStrategy.genValue(parameterDescriptor, codegen), iv);
iv.mark(loadArg);
}
compiler/testData/codegen/box/inlineClasses/defaultConstructorParameterValuesOfInlineClassType.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
// !LANGUAGE: +InlineClasses
// IGNORE_BACKEND: JVM_IR
inline class Z(val z: Int)
class Test(val z: Z = Z(42)) {
fun test() = z.z
}
fun box(): String {
if (Test().test() != 42) throw AssertionError()
if (Test(Z(123)).test() != 123) throw AssertionError()
return "OK"
}
compiler/testData/codegen/box/inlineClasses/defaultInterfaceFunParameterValuesOfInlineClassType.kt
Vendored
+24
View File
@@ -0,0 +1,24 @@
// !LANGUAGE: +InlineClasses
// IGNORE_BACKEND: JVM_IR
inline class Z(val z: Int)
interface ITest {
fun testDefault(z: Z = Z(42)) = z.z
fun testOverridden(z: Z = Z(42)): Int
}
class Test : ITest {
override fun testOverridden(z: Z) = z.z
}
fun box(): String {
if (Test().testDefault() != 42) throw AssertionError()
if (Test().testDefault(Z(123)) != 123) throw AssertionError()
if (Test().testOverridden() != 42) throw AssertionError()
if (Test().testOverridden(Z(123)) != 123) throw AssertionError()
return "OK"
}
compiler/testData/codegen/box/inlineClasses/defaultParameterValuesOfInlineClassType.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
// !LANGUAGE: +InlineClasses
// IGNORE_BACKEND: JVM_IR
inline class Z(val z: Int)
fun test(z: Z = Z(42)) = z.z
fun box(): String {
if (test() != 42) throw AssertionError()
if (test(Z(123)) != 123) throw AssertionError()
return "OK"
}
compiler/testData/codegen/box/inlineClasses/defaultParameterValuesOfInlineClassTypeBoxing.kt
Vendored
+29
View File
@@ -0,0 +1,29 @@
// !LANGUAGE: +InlineClasses
// IGNORE_BACKEND: JVM_IR
interface IFoo {
fun foo(): String
}
inline class Z(val z: Int) : IFoo {
override fun foo() = z.toString()
}
fun testNullable(z: Z? = Z(42)) = z!!.z
fun testAny(z: Any = Z(42)) = (z as Z).z
fun testInterface(z: IFoo = Z(42)) = z.foo()
fun box(): String {
if (testNullable() != 42) throw AssertionError()
if (testNullable(Z(123)) != 123) throw AssertionError()
if (testAny() != 42) throw AssertionError()
if (testAny(Z(123)) != 123) throw AssertionError()
if (testInterface() != "42") throw AssertionError()
if (testInterface(Z(123)) != "123") throw AssertionError()
return "OK"
}
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
Generated
+20
View File
@@ -11649,11 +11649,31 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/inlineClasses/crossinlineWithInlineClassInParameter.kt");
}
@TestMetadata("defaultConstructorParameterValuesOfInlineClassType.kt")
public void testDefaultConstructorParameterValuesOfInlineClassType() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultConstructorParameterValuesOfInlineClassType.kt");
}
@TestMetadata("defaultFunctionsFromAnyForInlineClass.kt")
public void testDefaultFunctionsFromAnyForInlineClass() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultFunctionsFromAnyForInlineClass.kt");
}
@TestMetadata("defaultInterfaceFunParameterValuesOfInlineClassType.kt")
public void testDefaultInterfaceFunParameterValuesOfInlineClassType() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultInterfaceFunParameterValuesOfInlineClassType.kt");
}
@TestMetadata("defaultParameterValuesOfInlineClassType.kt")
public void testDefaultParameterValuesOfInlineClassType() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValuesOfInlineClassType.kt");
}
@TestMetadata("defaultParameterValuesOfInlineClassTypeBoxing.kt")
public void testDefaultParameterValuesOfInlineClassTypeBoxing() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValuesOfInlineClassTypeBoxing.kt");
}
@TestMetadata("defaultValueOfInlineClassTypeInInlineFun.kt")
public void testDefaultValueOfInlineClassTypeInInlineFun() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultValueOfInlineClassTypeInInlineFun.kt");
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+20
View File
@@ -11649,11 +11649,31 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/inlineClasses/crossinlineWithInlineClassInParameter.kt");
}
@TestMetadata("defaultConstructorParameterValuesOfInlineClassType.kt")
public void testDefaultConstructorParameterValuesOfInlineClassType() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultConstructorParameterValuesOfInlineClassType.kt");
}
@TestMetadata("defaultFunctionsFromAnyForInlineClass.kt")
public void testDefaultFunctionsFromAnyForInlineClass() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultFunctionsFromAnyForInlineClass.kt");
}
@TestMetadata("defaultInterfaceFunParameterValuesOfInlineClassType.kt")
public void testDefaultInterfaceFunParameterValuesOfInlineClassType() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultInterfaceFunParameterValuesOfInlineClassType.kt");
}
@TestMetadata("defaultParameterValuesOfInlineClassType.kt")
public void testDefaultParameterValuesOfInlineClassType() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValuesOfInlineClassType.kt");
}
@TestMetadata("defaultParameterValuesOfInlineClassTypeBoxing.kt")
public void testDefaultParameterValuesOfInlineClassTypeBoxing() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValuesOfInlineClassTypeBoxing.kt");
}
@TestMetadata("defaultValueOfInlineClassTypeInInlineFun.kt")
public void testDefaultValueOfInlineClassTypeInInlineFun() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultValueOfInlineClassTypeInInlineFun.kt");
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
Generated
+20
View File
@@ -11654,11 +11654,31 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/inlineClasses/crossinlineWithInlineClassInParameter.kt");
}
@TestMetadata("defaultConstructorParameterValuesOfInlineClassType.kt")
public void testDefaultConstructorParameterValuesOfInlineClassType() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultConstructorParameterValuesOfInlineClassType.kt");
}
@TestMetadata("defaultFunctionsFromAnyForInlineClass.kt")
public void testDefaultFunctionsFromAnyForInlineClass() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultFunctionsFromAnyForInlineClass.kt");
}
@TestMetadata("defaultInterfaceFunParameterValuesOfInlineClassType.kt")
public void testDefaultInterfaceFunParameterValuesOfInlineClassType() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultInterfaceFunParameterValuesOfInlineClassType.kt");
}
@TestMetadata("defaultParameterValuesOfInlineClassType.kt")
public void testDefaultParameterValuesOfInlineClassType() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValuesOfInlineClassType.kt");
}
@TestMetadata("defaultParameterValuesOfInlineClassTypeBoxing.kt")
public void testDefaultParameterValuesOfInlineClassTypeBoxing() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValuesOfInlineClassTypeBoxing.kt");
}
@TestMetadata("defaultValueOfInlineClassTypeInInlineFun.kt")
public void testDefaultValueOfInlineClassTypeInInlineFun() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultValueOfInlineClassTypeInInlineFun.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+20
View File
@@ -10189,11 +10189,31 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/inlineClasses/crossinlineWithInlineClassInParameter.kt");
}
@TestMetadata("defaultConstructorParameterValuesOfInlineClassType.kt")
public void testDefaultConstructorParameterValuesOfInlineClassType() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultConstructorParameterValuesOfInlineClassType.kt");
}
@TestMetadata("defaultFunctionsFromAnyForInlineClass.kt")
public void testDefaultFunctionsFromAnyForInlineClass() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultFunctionsFromAnyForInlineClass.kt");
}
@TestMetadata("defaultInterfaceFunParameterValuesOfInlineClassType.kt")
public void testDefaultInterfaceFunParameterValuesOfInlineClassType() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultInterfaceFunParameterValuesOfInlineClassType.kt");
}
@TestMetadata("defaultParameterValuesOfInlineClassType.kt")
public void testDefaultParameterValuesOfInlineClassType() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValuesOfInlineClassType.kt");
}
@TestMetadata("defaultParameterValuesOfInlineClassTypeBoxing.kt")
public void testDefaultParameterValuesOfInlineClassTypeBoxing() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValuesOfInlineClassTypeBoxing.kt");
}
@TestMetadata("defaultValueOfInlineClassTypeInInlineFun.kt")
public void testDefaultValueOfInlineClassTypeInInlineFun() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultValueOfInlineClassTypeInInlineFun.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+20
View File
@@ -11234,11 +11234,31 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/inlineClasses/crossinlineWithInlineClassInParameter.kt");
}
@TestMetadata("defaultConstructorParameterValuesOfInlineClassType.kt")
public void testDefaultConstructorParameterValuesOfInlineClassType() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultConstructorParameterValuesOfInlineClassType.kt");
}
@TestMetadata("defaultFunctionsFromAnyForInlineClass.kt")
public void testDefaultFunctionsFromAnyForInlineClass() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultFunctionsFromAnyForInlineClass.kt");
}
@TestMetadata("defaultInterfaceFunParameterValuesOfInlineClassType.kt")
public void testDefaultInterfaceFunParameterValuesOfInlineClassType() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultInterfaceFunParameterValuesOfInlineClassType.kt");
}
@TestMetadata("defaultParameterValuesOfInlineClassType.kt")
public void testDefaultParameterValuesOfInlineClassType() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValuesOfInlineClassType.kt");
}
@TestMetadata("defaultParameterValuesOfInlineClassTypeBoxing.kt")
public void testDefaultParameterValuesOfInlineClassTypeBoxing() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValuesOfInlineClassTypeBoxing.kt");
}
@TestMetadata("defaultValueOfInlineClassTypeInInlineFun.kt")
public void testDefaultValueOfInlineClassTypeInInlineFun() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/defaultValueOfInlineClassTypeInInlineFun.kt");