azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unreachable code in ResolutionResultsHandler

Browse Source
This commit is contained in:
Alexander Udalov
2016-07-20 19:53:04 +03:00
parent 89c5799155
commit 5d04fa3c2f
2 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java
-7
View File
@@ -47,13 +47,6 @@ import static org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus.UNKNOW
public class ResolvedCallImpl<D extends CallableDescriptor> implements MutableResolvedCall<D> {
private static final Logger LOG = Logger.getInstance(ResolvedCallImpl.class);
public static final Function<MutableResolvedCall<?>, CallableDescriptor> MAP_TO_CANDIDATE = new Function<MutableResolvedCall<?>, CallableDescriptor>() {
@Override
public CallableDescriptor fun(MutableResolvedCall<?> resolvedCall) {
return resolvedCall.getCandidateDescriptor();
}
};
public static final Function<MutableResolvedCall<?>, CallableDescriptor> MAP_TO_RESULT = new Function<MutableResolvedCall<?>, CallableDescriptor>() {
@Override
public CallableDescriptor fun(MutableResolvedCall<?> resolvedCall) {
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionResultsHandler.java
+20 -29
View File
@@ -32,7 +32,6 @@ import java.util.Collection;
import java.util.EnumSet;
import java.util.Set;
import static org.jetbrains.kotlin.resolve.calls.model.ResolvedCallImpl.MAP_TO_CANDIDATE;
import static org.jetbrains.kotlin.resolve.calls.model.ResolvedCallImpl.MAP_TO_RESULT;
import static org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus.*;
@@ -133,33 +132,27 @@ public class ResolutionResultsHandler {
@NotNull Set<MutableResolvedCall<D>> failedCandidates,
@NotNull CheckArgumentTypesMode checkArgumentsMode
) {
if (failedCandidates.size() != 1) {
// This is needed when there are several overloads some of which are OK but for nullability of the receiver,
// and some are not OK at all. In this case we'd like to say "unsafe call" rather than "none applicable"
// Used to be: weak errors. Generalized for future extensions
for (EnumSet<ResolutionStatus> severityLevel : SEVERITY_LEVELS) {
Set<MutableResolvedCall<D>> thisLevel = Sets.newLinkedHashSet();
for (MutableResolvedCall<D> candidate : failedCandidates) {
if (severityLevel.contains(candidate.getStatus())) {
thisLevel.add(candidate);
}
}
if (!thisLevel.isEmpty()) {
if (severityLevel.contains(ARGUMENTS_MAPPING_ERROR)) {
return recordFailedInfo(tracing, trace, thisLevel);
}
OverloadResolutionResultsImpl<D> results = chooseAndReportMaximallySpecific(thisLevel, false, false, checkArgumentsMode);
return recordFailedInfo(tracing, trace, results.getResultingCalls());
}
}
assert false : "Should not be reachable, cause every status must belong to some level";
Set<MutableResolvedCall<D>> noOverrides = OverrideResolver.filterOutOverridden(failedCandidates, MAP_TO_CANDIDATE);
return recordFailedInfo(tracing, trace, noOverrides);
if (failedCandidates.size() == 1) {
return recordFailedInfo(tracing, trace, failedCandidates);
}
return recordFailedInfo(tracing, trace, failedCandidates);
for (EnumSet<ResolutionStatus> severityLevel : SEVERITY_LEVELS) {
Set<MutableResolvedCall<D>> thisLevel = Sets.newLinkedHashSet();
for (MutableResolvedCall<D> candidate : failedCandidates) {
if (severityLevel.contains(candidate.getStatus())) {
thisLevel.add(candidate);
}
}
if (!thisLevel.isEmpty()) {
if (severityLevel.contains(ARGUMENTS_MAPPING_ERROR)) {
return recordFailedInfo(tracing, trace, thisLevel);
}
OverloadResolutionResultsImpl<D> results = chooseAndReportMaximallySpecific(thisLevel, false, false, checkArgumentsMode);
return recordFailedInfo(tracing, trace, results.getResultingCalls());
}
}
throw new AssertionError("Should not be reachable, cause every status must belong to some level: " + failedCandidates);
}
@NotNull
@@ -186,7 +179,7 @@ public class ResolutionResultsHandler {
}
@NotNull
public <D extends CallableDescriptor> OverloadResolutionResultsImpl<D> chooseAndReportMaximallySpecific(
private <D extends CallableDescriptor> OverloadResolutionResultsImpl<D> chooseAndReportMaximallySpecific(
@NotNull Set<MutableResolvedCall<D>> candidates,
boolean discriminateGenerics,
boolean isDebuggerContext,
@@ -220,6 +213,4 @@ public class ResolutionResultsHandler {
return OverloadResolutionResultsImpl.ambiguity(noOverrides);
}
}