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

Minor. Removed generics.

Browse Source
This commit is contained in:
Stanislav Erokhin
2016-02-17 17:12:56 +03:00
parent 63b3cbafa4
commit 45de06ac0c
4 changed files with 41 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java
+33 -34
View File
@@ -73,8 +73,6 @@ public class CallResolver {
private static final PerformanceCounter callResolvePerfCounter = PerformanceCounter.Companion.create("Call resolve", ExpressionTypingVisitorDispatcher.typeInfoPerfCounter); private static final PerformanceCounter callResolvePerfCounter = PerformanceCounter.Companion.create("Call resolve", ExpressionTypingVisitorDispatcher.typeInfoPerfCounter);
public static boolean useNewResolve = !"false".equals(System.getProperty("kotlin.internal.new_resolve"));
public CallResolver( public CallResolver(
@NotNull KotlinBuiltIns builtIns @NotNull KotlinBuiltIns builtIns
) { ) {
@@ -152,7 +150,7 @@ public class CallResolver {
} }
@NotNull @NotNull
public OverloadResolutionResults<FunctionDescriptor> resolveCallForInvoke( private OverloadResolutionResults<FunctionDescriptor> resolveCallForInvoke(
@NotNull BasicCallResolutionContext context, @NotNull BasicCallResolutionContext context,
@NotNull TracingStrategy tracing @NotNull TracingStrategy tracing
) { ) {
@@ -162,7 +160,7 @@ public class CallResolver {
} }
@NotNull @NotNull
private <D extends CallableDescriptor, F extends D> OverloadResolutionResults<F> computeTasksAndResolveCall( private <D extends CallableDescriptor> OverloadResolutionResults<D> computeTasksAndResolveCall(
@NotNull BasicCallResolutionContext context, @NotNull BasicCallResolutionContext context,
@NotNull Name name, @NotNull Name name,
@NotNull KtReferenceExpression referenceExpression, @NotNull KtReferenceExpression referenceExpression,
@@ -173,15 +171,15 @@ public class CallResolver {
} }
@NotNull @NotNull
private <D extends CallableDescriptor, F extends D> OverloadResolutionResults<F> computeTasksAndResolveCall( private <D extends CallableDescriptor> OverloadResolutionResults<D> computeTasksAndResolveCall(
@NotNull final BasicCallResolutionContext context, @NotNull final BasicCallResolutionContext context,
@NotNull final Name name, @NotNull final Name name,
@NotNull final TracingStrategy tracing, @NotNull final TracingStrategy tracing,
@NotNull final ResolveKind kind @NotNull final ResolveKind kind
) { ) {
return callResolvePerfCounter.time(new Function0<OverloadResolutionResults<F>>() { return callResolvePerfCounter.time(new Function0<OverloadResolutionResults<D>>() {
@Override @Override
public OverloadResolutionResults<F> invoke() { public OverloadResolutionResults<D> invoke() {
TaskContextForMigration<D> contextForMigration = new TaskContextForMigration<D>( TaskContextForMigration<D> contextForMigration = new TaskContextForMigration<D>(
kind, name, null kind, name, null
); );
@@ -191,7 +189,7 @@ public class CallResolver {
} }
@NotNull @NotNull
private <D extends CallableDescriptor, F extends D> OverloadResolutionResults<F> computeTasksFromCandidatesAndResolvedCall( private <D extends CallableDescriptor> OverloadResolutionResults<D> computeTasksFromCandidatesAndResolvedCall(
@NotNull BasicCallResolutionContext context, @NotNull BasicCallResolutionContext context,
@NotNull KtReferenceExpression referenceExpression, @NotNull KtReferenceExpression referenceExpression,
@NotNull Collection<ResolutionCandidate<D>> candidates @NotNull Collection<ResolutionCandidate<D>> candidates
@@ -201,14 +199,14 @@ public class CallResolver {
} }
@NotNull @NotNull
private <D extends CallableDescriptor, F extends D> OverloadResolutionResults<F> computeTasksFromCandidatesAndResolvedCall( private <D extends CallableDescriptor> OverloadResolutionResults<D> computeTasksFromCandidatesAndResolvedCall(
@NotNull final BasicCallResolutionContext context, @NotNull final BasicCallResolutionContext context,
@NotNull final Collection<ResolutionCandidate<D>> candidates, @NotNull final Collection<ResolutionCandidate<D>> candidates,
@NotNull final TracingStrategy tracing @NotNull final TracingStrategy tracing
) { ) {
return callResolvePerfCounter.time(new Function0<OverloadResolutionResults<F>>() { return callResolvePerfCounter.time(new Function0<OverloadResolutionResults<D>>() {
@Override @Override
public OverloadResolutionResults<F> invoke() { public OverloadResolutionResults<D> invoke() {
TaskContextForMigration<D> contextForMigration = new TaskContextForMigration<D>( TaskContextForMigration<D> contextForMigration = new TaskContextForMigration<D>(
ResolveKind.GIVEN_CANDIDATES, null, candidates ResolveKind.GIVEN_CANDIDATES, null, candidates
); );
@@ -270,13 +268,13 @@ public class CallResolver {
ResolveKind.FUNCTION); ResolveKind.FUNCTION);
} }
else if (calleeExpression instanceof KtConstructorCalleeExpression) { else if (calleeExpression instanceof KtConstructorCalleeExpression) {
return resolveCallForConstructor(context, (KtConstructorCalleeExpression) calleeExpression); return (OverloadResolutionResults) resolveCallForConstructor(context, (KtConstructorCalleeExpression) calleeExpression);
} }
else if (calleeExpression instanceof KtConstructorDelegationReferenceExpression) { else if (calleeExpression instanceof KtConstructorDelegationReferenceExpression) {
KtConstructorDelegationCall delegationCall = (KtConstructorDelegationCall) context.call.getCallElement(); KtConstructorDelegationCall delegationCall = (KtConstructorDelegationCall) context.call.getCallElement();
DeclarationDescriptor container = context.scope.getOwnerDescriptor(); DeclarationDescriptor container = context.scope.getOwnerDescriptor();
assert container instanceof ConstructorDescriptor : "Trying to resolve JetConstructorDelegationCall not in constructor. scope.ownerDescriptor = " + container; assert container instanceof ConstructorDescriptor : "Trying to resolve JetConstructorDelegationCall not in constructor. scope.ownerDescriptor = " + container;
return resolveConstructorDelegationCall(context, delegationCall, (KtConstructorDelegationReferenceExpression) calleeExpression, return (OverloadResolutionResults) resolveConstructorDelegationCall(context, delegationCall, (KtConstructorDelegationReferenceExpression) calleeExpression,
(ConstructorDescriptor) container); (ConstructorDescriptor) container);
} }
else if (calleeExpression == null) { else if (calleeExpression == null) {
@@ -302,7 +300,7 @@ public class CallResolver {
return resolveCallForInvoke(context.replaceCall(call), tracingForInvoke); return resolveCallForInvoke(context.replaceCall(call), tracingForInvoke);
} }
private OverloadResolutionResults<FunctionDescriptor> resolveCallForConstructor( private OverloadResolutionResults<ConstructorDescriptor> resolveCallForConstructor(
@NotNull BasicCallResolutionContext context, @NotNull BasicCallResolutionContext context,
@NotNull KtConstructorCalleeExpression expression @NotNull KtConstructorCalleeExpression expression
) { ) {
@@ -335,17 +333,17 @@ public class CallResolver {
return checkArgumentTypesAndFail(context); return checkArgumentTypesAndFail(context);
} }
Pair<Collection<ResolutionCandidate<CallableDescriptor>>, BasicCallResolutionContext> candidatesAndContext = Pair<Collection<ResolutionCandidate<ConstructorDescriptor>>, BasicCallResolutionContext> candidatesAndContext =
prepareCandidatesAndContextForConstructorCall(constructedType, context); prepareCandidatesAndContextForConstructorCall(constructedType, context);
Collection<ResolutionCandidate<CallableDescriptor>> candidates = candidatesAndContext.getFirst(); Collection<ResolutionCandidate<ConstructorDescriptor>> candidates = candidatesAndContext.getFirst();
context = candidatesAndContext.getSecond(); context = candidatesAndContext.getSecond();
return computeTasksFromCandidatesAndResolvedCall(context, functionReference, candidates); return computeTasksFromCandidatesAndResolvedCall(context, functionReference, candidates);
} }
@Nullable @Nullable
public OverloadResolutionResults<FunctionDescriptor> resolveConstructorDelegationCall( public OverloadResolutionResults<ConstructorDescriptor> resolveConstructorDelegationCall(
@NotNull BindingTrace trace, @NotNull LexicalScope scope, @NotNull DataFlowInfo dataFlowInfo, @NotNull BindingTrace trace, @NotNull LexicalScope scope, @NotNull DataFlowInfo dataFlowInfo,
@NotNull ConstructorDescriptor constructorDescriptor, @NotNull ConstructorDescriptor constructorDescriptor,
@NotNull KtConstructorDelegationCall call @NotNull KtConstructorDelegationCall call
@@ -375,7 +373,7 @@ public class CallResolver {
} }
@NotNull @NotNull
private OverloadResolutionResults<FunctionDescriptor> resolveConstructorDelegationCall( private OverloadResolutionResults<ConstructorDescriptor> resolveConstructorDelegationCall(
@NotNull BasicCallResolutionContext context, @NotNull BasicCallResolutionContext context,
@NotNull KtConstructorDelegationCall call, @NotNull KtConstructorDelegationCall call,
@NotNull KtConstructorDelegationReferenceExpression calleeExpression, @NotNull KtConstructorDelegationReferenceExpression calleeExpression,
@@ -415,9 +413,9 @@ public class CallResolver {
calleeConstructor.getContainingDeclaration().getDefaultType() : calleeConstructor.getContainingDeclaration().getDefaultType() :
DescriptorUtils.getSuperClassType(currentClassDescriptor); DescriptorUtils.getSuperClassType(currentClassDescriptor);
Pair<Collection<ResolutionCandidate<CallableDescriptor>>, BasicCallResolutionContext> candidatesAndContext = Pair<Collection<ResolutionCandidate<ConstructorDescriptor>>, BasicCallResolutionContext> candidatesAndContext =
prepareCandidatesAndContextForConstructorCall(superType, context); prepareCandidatesAndContextForConstructorCall(superType, context);
Collection<ResolutionCandidate<CallableDescriptor>> candidates = candidatesAndContext.getFirst(); Collection<ResolutionCandidate<ConstructorDescriptor>> candidates = candidatesAndContext.getFirst();
context = candidatesAndContext.getSecond(); context = candidatesAndContext.getSecond();
TracingStrategy tracing = call.isImplicit() ? TracingStrategy tracing = call.isImplicit() ?
@@ -436,13 +434,13 @@ public class CallResolver {
} }
@NotNull @NotNull
private static Pair<Collection<ResolutionCandidate<CallableDescriptor>>, BasicCallResolutionContext> prepareCandidatesAndContextForConstructorCall( private static Pair<Collection<ResolutionCandidate<ConstructorDescriptor>>, BasicCallResolutionContext> prepareCandidatesAndContextForConstructorCall(
@NotNull KotlinType superType, @NotNull KotlinType superType,
@NotNull BasicCallResolutionContext context @NotNull BasicCallResolutionContext context
) { ) {
if (!(superType.getConstructor().getDeclarationDescriptor() instanceof ClassDescriptor)) { if (!(superType.getConstructor().getDeclarationDescriptor() instanceof ClassDescriptor)) {
return new Pair<Collection<ResolutionCandidate<CallableDescriptor>>, BasicCallResolutionContext>( return new Pair<Collection<ResolutionCandidate<ConstructorDescriptor>>, BasicCallResolutionContext>(
Collections.<ResolutionCandidate<CallableDescriptor>>emptyList(), context); Collections.<ResolutionCandidate<ConstructorDescriptor>>emptyList(), context);
} }
ClassDescriptor superClass = (ClassDescriptor) superType.getConstructor().getDeclarationDescriptor(); ClassDescriptor superClass = (ClassDescriptor) superType.getConstructor().getDeclarationDescriptor();
@@ -457,10 +455,10 @@ public class CallResolver {
context = context.replaceExpectedType(superType); context = context.replaceExpectedType(superType);
} }
Collection<ResolutionCandidate<CallableDescriptor>> candidates = Collection<ResolutionCandidate<ConstructorDescriptor>> candidates =
CallResolverUtilKt.createResolutionCandidatesForConstructors(context.scope, context.call, superClass, knownTypeParametersSubstitutor); CallResolverUtilKt.createResolutionCandidatesForConstructors(context.scope, context.call, superClass, knownTypeParametersSubstitutor);
return new Pair<Collection<ResolutionCandidate<CallableDescriptor>>, BasicCallResolutionContext>(candidates, context); return new Pair<Collection<ResolutionCandidate<ConstructorDescriptor>>, BasicCallResolutionContext>(candidates, context);
} }
private static boolean anyConstructorHasDeclaredTypeParameters(@Nullable ClassifierDescriptor classDescriptor) { private static boolean anyConstructorHasDeclaredTypeParameters(@Nullable ClassifierDescriptor classDescriptor) {
@@ -476,7 +474,7 @@ public class CallResolver {
@NotNull final Call call, @NotNull final Call call,
@NotNull final TracingStrategy tracing, @NotNull final TracingStrategy tracing,
@NotNull final ResolutionContext<?> context, @NotNull final ResolutionContext<?> context,
@NotNull final ResolutionCandidate<CallableDescriptor> candidate, @NotNull final ResolutionCandidate<FunctionDescriptor> candidate,
@Nullable final MutableDataFlowInfoForArguments dataFlowInfoForArguments @Nullable final MutableDataFlowInfoForArguments dataFlowInfoForArguments
) { ) {
return callResolvePerfCounter.time(new Function0<OverloadResolutionResults<FunctionDescriptor>>() { return callResolvePerfCounter.time(new Function0<OverloadResolutionResults<FunctionDescriptor>>() {
@@ -485,10 +483,10 @@ public class CallResolver {
BasicCallResolutionContext basicCallResolutionContext = BasicCallResolutionContext basicCallResolutionContext =
BasicCallResolutionContext.create(context, call, CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS, dataFlowInfoForArguments); BasicCallResolutionContext.create(context, call, CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS, dataFlowInfoForArguments);
Set<ResolutionCandidate<CallableDescriptor>> candidates = Collections.singleton(candidate); Set<ResolutionCandidate<FunctionDescriptor>> candidates = Collections.singleton(candidate);
TaskContextForMigration<CallableDescriptor> contextForMigration = TaskContextForMigration<FunctionDescriptor> contextForMigration =
new TaskContextForMigration<CallableDescriptor>( new TaskContextForMigration<FunctionDescriptor>(
ResolveKind.GIVEN_CANDIDATES, null, candidates ResolveKind.GIVEN_CANDIDATES, null, candidates
); );
@@ -498,7 +496,7 @@ public class CallResolver {
}); });
} }
private <D extends CallableDescriptor, F extends D> OverloadResolutionResultsImpl<F> doResolveCallOrGetCachedResults( private <D extends CallableDescriptor> OverloadResolutionResultsImpl<D> doResolveCallOrGetCachedResults(
@NotNull BasicCallResolutionContext context, @NotNull BasicCallResolutionContext context,
@NotNull TaskContextForMigration<D> contextForMigration, @NotNull TaskContextForMigration<D> contextForMigration,
@NotNull TracingStrategy tracing @NotNull TracingStrategy tracing
@@ -512,7 +510,7 @@ public class CallResolver {
BindingContextUtilsKt.recordScope(newContext.trace, newContext.scope, newContext.call.getCalleeExpression()); BindingContextUtilsKt.recordScope(newContext.trace, newContext.scope, newContext.call.getCalleeExpression());
BindingContextUtilsKt.recordDataFlowInfo(newContext, newContext.call.getCalleeExpression()); BindingContextUtilsKt.recordDataFlowInfo(newContext, newContext.call.getCalleeExpression());
OverloadResolutionResultsImpl<F> results = doResolveCall(newContext, contextForMigration, tracing); OverloadResolutionResultsImpl<D> results = doResolveCall(newContext, contextForMigration, tracing);
DelegatingBindingTrace deltasTraceForTypeInference = ((OverloadResolutionResultsImpl) results).getTrace(); DelegatingBindingTrace deltasTraceForTypeInference = ((OverloadResolutionResultsImpl) results).getTrace();
if (deltasTraceForTypeInference != null) { if (deltasTraceForTypeInference != null) {
deltasTraceForTypeInference.addOwnDataTo(traceToResolveCall); deltasTraceForTypeInference.addOwnDataTo(traceToResolveCall);
@@ -570,7 +568,7 @@ public class CallResolver {
} }
@NotNull @NotNull
private <D extends CallableDescriptor, F extends D> OverloadResolutionResultsImpl<F> doResolveCall( private <D extends CallableDescriptor> OverloadResolutionResultsImpl<D> doResolveCall(
@NotNull BasicCallResolutionContext context, @NotNull BasicCallResolutionContext context,
@NotNull TaskContextForMigration<D> contextForMigration, @NotNull TaskContextForMigration<D> contextForMigration,
@NotNull TracingStrategy tracing @NotNull TracingStrategy tracing
@@ -595,11 +593,12 @@ public class CallResolver {
if (contextForMigration.resolveKind != ResolveKind.GIVEN_CANDIDATES) { if (contextForMigration.resolveKind != ResolveKind.GIVEN_CANDIDATES) {
assert contextForMigration.name != null; assert contextForMigration.name != null;
return (OverloadResolutionResultsImpl<F>) return (OverloadResolutionResultsImpl<D>)
newCallResolver.runResolve(context, contextForMigration.name, contextForMigration.resolveKind, tracing); newCallResolver.runResolve(context, contextForMigration.name, contextForMigration.resolveKind, tracing);
} }
else { else {
return (OverloadResolutionResultsImpl<F>) newCallResolver.runResolveForGivenCandidates(context, tracing, contextForMigration.givenCandidates); assert contextForMigration.givenCandidates != null;
return newCallResolver.runResolveForGivenCandidates(context, tracing, contextForMigration.givenCandidates);
} }
} }
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolverUtil.kt
+2 -2
View File
@@ -172,7 +172,7 @@ fun createResolutionCandidatesForConstructors(
call: Call, call: Call,
classWithConstructors: ClassDescriptor, classWithConstructors: ClassDescriptor,
knownSubstitutor: TypeSubstitutor? = null knownSubstitutor: TypeSubstitutor? = null
): Collection<ResolutionCandidate<CallableDescriptor>> { ): Collection<ResolutionCandidate<ConstructorDescriptor>> {
val constructors = classWithConstructors.constructors val constructors = classWithConstructors.constructors
if (constructors.isEmpty()) return emptyList() if (constructors.isEmpty()) return emptyList()
@@ -196,5 +196,5 @@ fun createResolutionCandidatesForConstructors(
dispatchReceiver = null dispatchReceiver = null
} }
return constructors.map { ResolutionCandidate.create<CallableDescriptor>(call, it, dispatchReceiver, null, receiverKind, knownSubstitutor) } return constructors.map { ResolutionCandidate.create(call, it, dispatchReceiver, null, receiverKind, knownSubstitutor) }
} }
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/VariableAsFunctionResolvedCall.kt
+3 -8
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2015 JetBrains s.r.o. * Copyright 2010-2016 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -18,9 +18,8 @@ package org.jetbrains.kotlin.resolve.calls.model
import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.descriptors.VariableDescriptor
import org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus
import org.jetbrains.kotlin.resolve.DelegatingBindingTrace import org.jetbrains.kotlin.resolve.DelegatingBindingTrace
import org.jetbrains.kotlin.resolve.calls.CallResolver import org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus
interface VariableAsFunctionResolvedCall { interface VariableAsFunctionResolvedCall {
val functionCall: ResolvedCall<FunctionDescriptor> val functionCall: ResolvedCall<FunctionDescriptor>
@@ -47,11 +46,7 @@ class VariableAsFunctionResolvedCallImpl(
override fun getStatus(): ResolutionStatus = variableCall.status.combine(functionCall.status) override fun getStatus(): ResolutionStatus = variableCall.status.combine(functionCall.status)
override fun getTrace(): DelegatingBindingTrace { override fun getTrace(): DelegatingBindingTrace {
//functionCall.trace is temporary trace above variableCall.trace and is committed already return functionCall.trace
if (CallResolver.useNewResolve) {
return functionCall.trace
}
return variableCall.trace
} }
} }
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java
+3 -3
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2015 JetBrains s.r.o. * Copyright 2010-2016 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -105,8 +105,8 @@ public class ControlStructureTypingUtils {
construct, argumentNames, isArgumentNullable); construct, argumentNames, isArgumentNullable);
TracingStrategy tracing = createTracingForSpecialConstruction(call, construct.getName(), context); TracingStrategy tracing = createTracingForSpecialConstruction(call, construct.getName(), context);
TypeSubstitutor knownTypeParameterSubstitutor = createKnownTypeParameterSubstitutorForSpecialCall(construct, function, context.expectedType); TypeSubstitutor knownTypeParameterSubstitutor = createKnownTypeParameterSubstitutorForSpecialCall(construct, function, context.expectedType);
ResolutionCandidate<CallableDescriptor> resolutionCandidate = ResolutionCandidate<FunctionDescriptor> resolutionCandidate =
ResolutionCandidate.<CallableDescriptor>create(call, function, knownTypeParameterSubstitutor); ResolutionCandidate.<FunctionDescriptor>create(call, function, knownTypeParameterSubstitutor);
OverloadResolutionResults<FunctionDescriptor> results = callResolver.resolveCallWithKnownCandidate( OverloadResolutionResults<FunctionDescriptor> results = callResolver.resolveCallWithKnownCandidate(
call, tracing, context, resolutionCandidate, dataFlowInfoForArguments); call, tracing, context, resolutionCandidate, dataFlowInfoForArguments);
assert results.isSingleResult() : "Not single result after resolving one known candidate"; assert results.isSingleResult() : "Not single result after resolving one known candidate";