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

ControlStructureTypingUtils: use real module descriptor instead of error module

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-09-16 18:51:38 +03:00
parent 7429b65c73
commit 9f858cbc56
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java
+10 -5
View File
@@ -48,7 +48,9 @@ import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionCandidate;
import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy; import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy;
import org.jetbrains.kotlin.resolve.calls.util.CallMaker; import org.jetbrains.kotlin.resolve.calls.util.CallMaker;
import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue;
import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.kotlin.types.TypeUtils;
import org.jetbrains.kotlin.types.Variance;
import java.util.*; import java.util.*;
@@ -61,13 +63,16 @@ public class ControlStructureTypingUtils {
private final CallResolver callResolver; private final CallResolver callResolver;
private final DataFlowAnalyzer dataFlowAnalyzer; private final DataFlowAnalyzer dataFlowAnalyzer;
private final ModuleDescriptor moduleDescriptor;
public ControlStructureTypingUtils( public ControlStructureTypingUtils(
@NotNull CallResolver callResolver, @NotNull CallResolver callResolver,
@NotNull DataFlowAnalyzer dataFlowAnalyzer @NotNull DataFlowAnalyzer dataFlowAnalyzer,
@NotNull ModuleDescriptor moduleDescriptor
) { ) {
this.callResolver = callResolver; this.callResolver = callResolver;
this.dataFlowAnalyzer = dataFlowAnalyzer; this.dataFlowAnalyzer = dataFlowAnalyzer;
this.moduleDescriptor = moduleDescriptor;
} }
/*package*/ ResolvedCall<FunctionDescriptor> resolveSpecialConstructionAsCall( /*package*/ ResolvedCall<FunctionDescriptor> resolveSpecialConstructionAsCall(
@@ -88,7 +93,7 @@ public class ControlStructureTypingUtils {
return results.getResultingCall(); return results.getResultingCall();
} }
private static SimpleFunctionDescriptorImpl createFunctionDescriptorForSpecialConstruction( private SimpleFunctionDescriptorImpl createFunctionDescriptorForSpecialConstruction(
@NotNull String constructionName, @NotNull String constructionName,
@NotNull List<String> argumentNames, @NotNull List<String> argumentNames,
@NotNull List<Boolean> isArgumentNullable @NotNull List<Boolean> isArgumentNullable
@@ -98,8 +103,8 @@ public class ControlStructureTypingUtils {
Name specialFunctionName = Name.identifierNoValidate("<SPECIAL-FUNCTION-FOR-" + constructionName + "-RESOLVE>"); Name specialFunctionName = Name.identifierNoValidate("<SPECIAL-FUNCTION-FOR-" + constructionName + "-RESOLVE>");
SimpleFunctionDescriptorImpl function = SimpleFunctionDescriptorImpl.create( SimpleFunctionDescriptorImpl function = SimpleFunctionDescriptorImpl.create(
ErrorUtils.getErrorModule(),//todo hack to avoid returning true in 'isError(DeclarationDescriptor)' moduleDescriptor, Annotations.EMPTY, specialFunctionName, CallableMemberDescriptor.Kind.DECLARATION, SourceElement.NO_SOURCE
Annotations.EMPTY, specialFunctionName, CallableMemberDescriptor.Kind.DECLARATION, SourceElement.NO_SOURCE); );
TypeParameterDescriptor typeParameter = TypeParameterDescriptorImpl.createWithDefaultBound( TypeParameterDescriptor typeParameter = TypeParameterDescriptorImpl.createWithDefaultBound(
function, Annotations.EMPTY, false, Variance.INVARIANT, function, Annotations.EMPTY, false, Variance.INVARIANT,