stop resolution if ambiguity is found

2012-04-06 20:39:16 +04:00
parent f6d8771f79
commit 2de69d8cd8
2 changed files with 24 additions and 2 deletions
@@ -262,10 +262,12 @@ public class CallResolver {
        for (ResolutionTask<D> task : prioritizedTasks) {
            TemporaryBindingTrace temporaryTrace = TemporaryBindingTrace.create(context.trace);
            OverloadResolutionResultsImpl<D> results = performResolutionGuardedForExtraFunctionLiteralArguments(task.withTrace(temporaryTrace));
-            if (results.isSuccess()) {
+            if (results.isSuccess() || results.isAmbiguity()) {
                temporaryTrace.commit();

-                debugInfo.set(ResolutionDebugInfo.RESULT, results.getResultingCall());
+                if (results.isSuccess()) {
+                    debugInfo.set(ResolutionDebugInfo.RESULT, results.getResultingCall());
+                }

                return results;
            }