From 31e5e9e9ef211439c658593a44778b932d7970d5 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Sun, 8 Jul 2012 15:26:40 +0400 Subject: [PATCH] 'typeInferenceFailed' method removed from TracingStrategy (it might be reported at the end of resolution process, when there is no tracing) --- .../jetbrains/jet/lang/resolve/calls/ResolutionTask.java | 7 ------- .../jetbrains/jet/lang/resolve/calls/TracingStrategy.java | 6 ------ 2 files changed, 13 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ResolutionTask.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ResolutionTask.java index 7b3f755b7fa..5ef4c6677db 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ResolutionTask.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ResolutionTask.java @@ -26,7 +26,6 @@ import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.calls.inference.SolutionStatus; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; @@ -185,12 +184,6 @@ public class ResolutionTask extends R trace.report(CREATING_AN_INSTANCE_OF_ABSTRACT_CLASS.on(call.getCallElement())); } - @Override - public void typeInferenceFailed(@NotNull BindingTrace trace, SolutionStatus status) { - assert !status.isSuccessful(); - trace.report(TYPE_INFERENCE_FAILED.on(call.getCallElement(), status)); - } - @Override public void unsafeCall(@NotNull BindingTrace trace, @NotNull JetType type, boolean isCallForImplicitInvoke) { ASTNode callOperationNode = call.getCallOperationNode(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/TracingStrategy.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/TracingStrategy.java index 59922c30ade..bcb415d8963 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/TracingStrategy.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/TracingStrategy.java @@ -22,7 +22,6 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.psi.JetExpression; import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.lang.resolve.calls.inference.SolutionStatus; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor; import org.jetbrains.jet.lang.types.JetType; @@ -71,9 +70,6 @@ import java.util.List; @Override public void instantiationOfAbstractClass(@NotNull BindingTrace trace) {} - @Override - public void typeInferenceFailed(@NotNull BindingTrace trace, SolutionStatus status) {} - @Override public void unsafeCall(@NotNull BindingTrace trace, @NotNull JetType type, boolean isCallForImplicitInvoke) {} @@ -110,8 +106,6 @@ import java.util.List; void instantiationOfAbstractClass(@NotNull BindingTrace trace); - void typeInferenceFailed(@NotNull BindingTrace trace, SolutionStatus status); - void unsafeCall(@NotNull BindingTrace trace, @NotNull JetType type, boolean isCallForImplicitInvoke); void unnecessarySafeCall(@NotNull BindingTrace trace, @NotNull JetType type);