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

bug fixed: do not substitute type parameters twice

Browse Source 
through final argument check
This commit is contained in:
Svetlana Isakova
2013-09-03 19:50:00 +04:00
parent a49dcc0dd4
commit b5e6568726
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java
+5 -10
View File
@@ -63,6 +63,7 @@ import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.PLACEHOLDER_
import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS;
import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.SKIP_FUNCTION_ARGUMENTS;
import static org.jetbrains.jet.lang.resolve.calls.CallTransformer.CallForImplicitInvoke;
import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.*;
import static org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus.*;
import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE;
import static org.jetbrains.jet.lang.types.TypeUtils.noExpectedType;
@@ -338,15 +339,10 @@ public class CandidateResolver {
@NotNull ValueParameterDescriptor parameterDescriptor,
@NotNull CallCandidateResolutionContext<D> context
) {
ConstraintSystem constraintSystem = context.candidateCall.getConstraintSystem();
JetExpression expression = argument.getArgumentExpression();
if (expression == null) return;
JetType effectiveExpectedType = getEffectiveExpectedType(parameterDescriptor, argument);
JetType expectedType = constraintSystem != null
? constraintSystem.getCurrentSubstitutor().substitute(effectiveExpectedType, Variance.INVARIANT)
: effectiveExpectedType;
JetType expectedType = getEffectiveExpectedType(parameterDescriptor, argument);
context = context.replaceExpectedType(expectedType);
JetExpression keyExpression = getDeferredComputationKeyExpression(expression);
@@ -365,8 +361,7 @@ public class CandidateResolver {
}
CallCandidateResolutionContext<FunctionDescriptor> contextForArgument = storedContextForArgument
.replaceContextDependency(ContextDependency.INDEPENDENT).replaceBindingTrace(context.trace).replaceExpectedType(
expectedType);
.replaceContextDependency(INDEPENDENT).replaceBindingTrace(context.trace).replaceExpectedType(expectedType);
JetType type;
if (contextForArgument.candidateCall.hasIncompleteTypeParameters()) {
type = completeTypeInferenceDependentOnExpectedTypeForCall(contextForArgument, true);
@@ -510,7 +505,7 @@ public class CandidateResolver {
CallCandidateResolutionContext<D> newContext = context
.replaceBindingTrace(errorInterceptingTrace).replaceExpectedType(expectedType)
.replaceDataFlowInfo(dataFlowInfoForArgument).replaceResolutionResultsCache(temporaryToResolveFunctionLiteral.cache)
.replaceContextDependency(ContextDependency.INDEPENDENT);
.replaceContextDependency(INDEPENDENT);
JetType type = argumentTypeResolver.getFunctionLiteralTypeInfo(
argumentExpression, functionLiteralExpression, newContext, RESOLVE_FUNCTION_ARGUMENTS).getType();
if (!mismatch[0]) {
@@ -523,7 +518,7 @@ public class CandidateResolver {
JetType expectedTypeWithoutReturnType = hasExpectedReturnType ? CallResolverUtil.replaceReturnTypeByUnknown(expectedType) : expectedType;
CallCandidateResolutionContext<D> newContext = context
.replaceExpectedType(expectedTypeWithoutReturnType).replaceDataFlowInfo(dataFlowInfoForArgument)
.replaceContextDependency(ContextDependency.INDEPENDENT);
.replaceContextDependency(INDEPENDENT);
JetType type = argumentTypeResolver.getFunctionLiteralTypeInfo(argumentExpression, functionLiteralExpression, newContext,
RESOLVE_FUNCTION_ARGUMENTS).getType();
constraintSystem.addSubtypeConstraint(
compiler/testData/diagnostics/tests/inference/opposite.kt
+11
View File
@@ -0,0 +1,11 @@
package a
trait Persistent
trait PersistentFactory<T>
class Relation<Source: Persistent, Target: Persistent>(
val sources: PersistentFactory<Source>,
val targets: PersistentFactory<Target>
) {
fun opposite() = Relation(targets, sources)
}
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+5
View File
@@ -2820,6 +2820,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
doTest("compiler/testData/diagnostics/tests/inference/noInformationForParameter.kt");
}
@TestMetadata("opposite.kt")
public void testOpposite() throws Exception {
doTest("compiler/testData/diagnostics/tests/inference/opposite.kt");
}
@TestMetadata("possibleCycleOnConstraints.kt")
public void testPossibleCycleOnConstraints() throws Exception {
doTest("compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.kt");