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

[NI] Bind all new resolved calls before update arguments.

Browse Source
This commit is contained in:
Stanislav Erokhin
2017-05-24 22:49:52 +03:00
committed by Mikhail Zarechenskiy
parent 42438bd363
commit de17604fe7
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt
+7 -2
View File
@@ -71,6 +71,11 @@ class KotlinToResolvedCallTransformer(
runCallCheckers(resolvedCall, callCheckerContext) runCallCheckers(resolvedCall, callCheckerContext)
} }
runLambdaArgumentsChecks(context, trace, baseResolvedCall.lambdaArguments) runLambdaArgumentsChecks(context, trace, baseResolvedCall.lambdaArguments)
allResolvedCalls.map {
if (it is VariableAsFunctionResolvedCall) it.functionCall else it
}.forEach {
runArgumentsChecks(context, trace, it as NewResolvedCallImpl<*>)
}
} }
return result return result
@@ -115,13 +120,13 @@ class KotlinToResolvedCallTransformer(
return when (completedCall) { return when (completedCall) {
is CompletedKotlinCall.Simple -> { is CompletedKotlinCall.Simple -> {
NewResolvedCallImpl<D>(completedCall).runIfTraceNotNull(this::bindResolvedCall).runIfTraceNotNull(this::runArgumentsChecks) NewResolvedCallImpl<D>(completedCall).runIfTraceNotNull(this::bindResolvedCall)
} }
is CompletedKotlinCall.VariableAsFunction -> { is CompletedKotlinCall.VariableAsFunction -> {
val resolvedCall = NewVariableAsFunctionResolvedCallImpl( val resolvedCall = NewVariableAsFunctionResolvedCallImpl(
completedCall, completedCall,
NewResolvedCallImpl(completedCall.variableCall), NewResolvedCallImpl(completedCall.variableCall),
NewResolvedCallImpl<FunctionDescriptor>(completedCall.invokeCall).runIfTraceNotNull(this::runArgumentsChecks) NewResolvedCallImpl<FunctionDescriptor>(completedCall.invokeCall)
).runIfTraceNotNull(this::bindResolvedCall) ).runIfTraceNotNull(this::bindResolvedCall)
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")