diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt4142.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt4142.kt new file mode 100644 index 00000000000..e02b05f37bb --- /dev/null +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt4142.kt @@ -0,0 +1,16 @@ +open class B { + val name: String + get() = "OK" +} + +trait A { + val name: String +} + +class C : B(), A { + +} + +fun box(): String { + return C().name +} diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java index f8012c0beb4..03411563816 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java @@ -3062,6 +3062,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode doTestWithStdlib(fileName); } + @TestMetadata("kt4142.kt") + public void testKt4142() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt4142.kt"); + doTestWithStdlib(fileName); + } + @TestMetadata("kt4262.kt") public void testKt4262() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt4262.kt");