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

Do not perform type checks for function literals in visitor in NI mode

Browse Source 
They are type-checked as arguments for the corresponding expressions.
This commit is contained in:
Dmitry Petrov
2017-06-07 18:24:43 +03:00
committed by Mikhail Zarechenskiy
parent fbad16567b
commit 8599763cb9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FunctionsTypingVisitor.kt
+2 -1
View File
@@ -36,6 +36,7 @@ import org.jetbrains.kotlin.resolve.BindingContext.EXPECTED_RETURN_TYPE
import org.jetbrains.kotlin.resolve.BindingContextUtils import org.jetbrains.kotlin.resolve.BindingContextUtils
import org.jetbrains.kotlin.resolve.BindingTrace import org.jetbrains.kotlin.resolve.BindingTrace
import org.jetbrains.kotlin.resolve.FunctionDescriptorUtil import org.jetbrains.kotlin.resolve.FunctionDescriptorUtil
import org.jetbrains.kotlin.resolve.calls.USE_NEW_INFERENCE
import org.jetbrains.kotlin.resolve.checkers.UnderscoreChecker import org.jetbrains.kotlin.resolve.checkers.UnderscoreChecker
import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil
import org.jetbrains.kotlin.resolve.scopes.LexicalWritableScope import org.jetbrains.kotlin.resolve.scopes.LexicalWritableScope
@@ -130,7 +131,7 @@ internal class FunctionsTypingVisitor(facade: ExpressionTypingInternals) : Expre
val resultType = functionDescriptor.createFunctionType(suspendFunctionTypeExpected) val resultType = functionDescriptor.createFunctionType(suspendFunctionTypeExpected)
if (functionalTypeExpected) if (USE_NEW_INFERENCE && functionalTypeExpected)
createTypeInfo(resultType, context) createTypeInfo(resultType, context)
else else
components.dataFlowAnalyzer.createCheckedTypeInfo(resultType, context, function) components.dataFlowAnalyzer.createCheckedTypeInfo(resultType, context, function)