Use original descriptor when mapping fake override

Otherwise wrong CONFLICTING_INHERITED_JVM_DECLARATIONS were reported #KT-10691 Fixed
2016-02-18 17:59:42 +03:00
parent 582b1c5e66
commit 4c88e2a0bc
11 changed files with 200 additions and 11 deletions
@@ -5333,6 +5333,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure"), Pattern.compile("^(.+)\\.kt$"), true);
                }

+                @TestMetadata("clashFromInterfaceAndSuperClass.kt")
+                public void testClashFromInterfaceAndSuperClass() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt");
+                    doTest(fileName);
+                }
+
                @TestMetadata("collections.kt")
                public void testCollections() throws Exception {
                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.kt");