small fix while choosing maximally specific

return success if there is one candidate after filterOverrides step #KT-1461 fixed
2013-03-11 14:25:22 +04:00
parent 9d05a4548c
commit 7b6dfc3470
3 changed files with 63 additions and 31 deletions
@@ -162,39 +162,39 @@ public class ResolutionResultsHandler {
            @NotNull Set<ResolvedCallWithTrace<D>> candidates,
            boolean discriminateGenerics
    ) {
-        if (candidates.size() != 1) {
-            Set<ResolvedCallWithTrace<D>> cleanCandidates = Sets.newLinkedHashSet(candidates);
-            for (Iterator<ResolvedCallWithTrace<D>> iterator = cleanCandidates.iterator(); iterator.hasNext(); ) {
-                ResolvedCallWithTrace<D> candidate = iterator.next();
-                if (candidate.isDirty()) {
-                    iterator.remove();
-                }
-            }
-
-            if (cleanCandidates.isEmpty()) {
-                cleanCandidates = candidates;
-            }
-            ResolvedCallWithTrace<D> maximallySpecific = OverloadingConflictResolver.INSTANCE.findMaximallySpecific(cleanCandidates, false);
-            if (maximallySpecific != null) {
-                return OverloadResolutionResultsImpl.success(maximallySpecific);
-            }
-
-            if (discriminateGenerics) {
-                ResolvedCallWithTrace<D> maximallySpecificGenericsDiscriminated = OverloadingConflictResolver.INSTANCE.findMaximallySpecific(cleanCandidates, true);
-                if (maximallySpecificGenericsDiscriminated != null) {
-                    return OverloadResolutionResultsImpl.success(maximallySpecificGenericsDiscriminated);
-                }
-            }
-
-            Set<ResolvedCallWithTrace<D>> noOverrides = OverridingUtil.filterOverrides(candidates, MAP_TO_RESULT);
-
-            return OverloadResolutionResultsImpl.ambiguity(noOverrides);
+        if (candidates.size() == 1) {
+            return OverloadResolutionResultsImpl.success(candidates.iterator().next());
        }
-        else {
-            ResolvedCallWithTrace<D> result = candidates.iterator().next();

-            return OverloadResolutionResultsImpl.success(result);
+        Set<ResolvedCallWithTrace<D>> cleanCandidates = Sets.newLinkedHashSet(candidates);
+        for (Iterator<ResolvedCallWithTrace<D>> iterator = cleanCandidates.iterator(); iterator.hasNext(); ) {
+            ResolvedCallWithTrace<D> candidate = iterator.next();
+            if (candidate.isDirty()) {
+                iterator.remove();
+            }
        }
+
+        if (cleanCandidates.isEmpty()) {
+            cleanCandidates = candidates;
+        }
+        ResolvedCallWithTrace<D> maximallySpecific = OverloadingConflictResolver.INSTANCE.findMaximallySpecific(cleanCandidates, false);
+        if (maximallySpecific != null) {
+            return OverloadResolutionResultsImpl.success(maximallySpecific);
+        }
+
+        if (discriminateGenerics) {
+            ResolvedCallWithTrace<D> maximallySpecificGenericsDiscriminated = OverloadingConflictResolver.INSTANCE.findMaximallySpecific(cleanCandidates, true);
+            if (maximallySpecificGenericsDiscriminated != null) {
+                return OverloadResolutionResultsImpl.success(maximallySpecificGenericsDiscriminated);
+            }
+        }
+
+        Set<ResolvedCallWithTrace<D>> noOverrides = OverridingUtil.filterOverrides(candidates, MAP_TO_RESULT);
+        if (noOverrides.size() == 1) {
+                return OverloadResolutionResultsImpl.success(noOverrides.iterator().next());
+        }
+
+        return OverloadResolutionResultsImpl.ambiguity(noOverrides);
    }


@@ -0,0 +1,18 @@
+//KT-1461 Front-end complains on overload resolution when superclass property is accessed from string template and implicit type cast is performed
+package f
+
+open class Super(val property : String) {}
+
+class Sub(str : String) : Super(str) {}
+
+fun foo(sup : Super, sub : Sub) {
+    if (sup is Sub) {
+        println("${sup.property}")
+        println(sup.property)
+    }
+    println("${sub.property}")
+    println(sub.property)
+}
+
+//from library
+fun println(<!UNUSED_PARAMETER!>message<!> : Any?) { throw Exception() }
@@ -33,7 +33,7 @@ import org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve;
@InnerTestClasses({JetDiagnosticsTestGenerated.Tests.class, JetDiagnosticsTestGenerated.Script.class})
 public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEagerResolve {
    @TestMetadata("compiler/testData/diagnostics/tests")
-    @InnerTestClasses({Tests.Annotations.class, Tests.BackingField.class, Tests.Cast.class, Tests.CheckArguments.class, Tests.ControlFlowAnalysis.class, Tests.ControlStructures.class, Tests.DataClasses.class, Tests.DataFlow.class, Tests.DataFlowInfoTraversal.class, Tests.DeclarationChecks.class, Tests.Deparenthesize.class, Tests.Enum.class, Tests.Extensions.class, Tests.FunctionLiterals.class, Tests.Generics.class, Tests.IncompleteCode.class, Tests.Inference.class, Tests.Infos.class, Tests.Inner.class, Tests.J_k.class, Tests.Jdk_annotations.class, Tests.Library.class, Tests.NullabilityAndAutoCasts.class, Tests.NullableTypes.class, Tests.Objects.class, Tests.OperatorsOverloading.class, Tests.Overload.class, Tests.Override.class, Tests.Redeclarations.class, Tests.Regressions.class, Tests.Resolve.class, Tests.Scopes.class, Tests.SenselessComparison.class, Tests.Shadowing.class, Tests.Substitutions.class, Tests.Subtyping.class, Tests.ThisAndSuper.class, Tests.Tuples.class, Tests.Varargs.class})
+    @InnerTestClasses({Tests.Annotations.class, Tests.BackingField.class, Tests.Cast.class, Tests.CheckArguments.class, Tests.ControlFlowAnalysis.class, Tests.ControlStructures.class, Tests.DataClasses.class, Tests.DataFlow.class, Tests.DataFlowInfoTraversal.class, Tests.DeclarationChecks.class, Tests.Deparenthesize.class, Tests.Enum.class, Tests.Extensions.class, Tests.FunctionLiterals.class, Tests.Generics.class, Tests.IncompleteCode.class, Tests.Inference.class, Tests.Infos.class, Tests.Inner.class, Tests.J_k.class, Tests.Jdk_annotations.class, Tests.Library.class, Tests.NullabilityAndAutoCasts.class, Tests.NullableTypes.class, Tests.Objects.class, Tests.OperatorsOverloading.class, Tests.Overload.class, Tests.Override.class, Tests.Redeclarations.class, Tests.Regressions.class, Tests.Resolve.class, Tests.Scopes.class, Tests.SenselessComparison.class, Tests.Shadowing.class, Tests.SmartCasts.class, Tests.Substitutions.class, Tests.Subtyping.class, Tests.ThisAndSuper.class, Tests.Tuples.class, Tests.Varargs.class})
    public static class Tests extends AbstractDiagnosticsTestWithEagerResolve {
        @TestMetadata("Abstract.kt")
        public void testAbstract() throws Exception {
@@ -4202,6 +4202,19 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            
        }
        
+        @TestMetadata("compiler/testData/diagnostics/tests/smartCasts")
+        public static class SmartCasts extends AbstractDiagnosticsTestWithEagerResolve {
+            public void testAllFilesPresentInSmartCasts() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/smartCasts"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+            
+            @TestMetadata("kt1461.kt")
+            public void testKt1461() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/smartCasts/kt1461.kt");
+            }
+            
+        }
+        
        @TestMetadata("compiler/testData/diagnostics/tests/substitutions")
        public static class Substitutions extends AbstractDiagnosticsTestWithEagerResolve {
            public void testAllFilesPresentInSubstitutions() throws Exception {
@@ -4434,6 +4447,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
            suite.addTestSuite(Scopes.class);
            suite.addTestSuite(SenselessComparison.class);
            suite.addTestSuite(Shadowing.class);
+            suite.addTestSuite(SmartCasts.class);
            suite.addTestSuite(Substitutions.class);
            suite.addTestSuite(Subtyping.class);
            suite.addTestSuite(ThisAndSuper.class);