IR: handle conflicts in resolveFakeOverride()

2020-02-12 18:37:09 +03:00
parent c71e87068a
commit 79060e7f40
6 changed files with 46 additions and 1 deletions
@@ -28157,6 +28157,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
            runTest("compiler/testData/codegen/box/traits/multiple.kt");
        }

+        @TestMetadata("multipleImplFromJava.kt")
+        public void testMultipleImplFromJava() throws Exception {
+            runTest("compiler/testData/codegen/box/traits/multipleImplFromJava.kt");
+        }
+
        @TestMetadata("noPrivateDelegation.kt")
        public void testNoPrivateDelegation() throws Exception {
            runTest("compiler/testData/codegen/box/traits/noPrivateDelegation.kt");