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

FirBuilderInferenceSession: fix calculation of effectivelyEmptyCommonSystem

Browse Source 
#KT-57873 Fixed
This commit is contained in:
Mikhail Glukhikh
2023-04-17 18:45:46 +02:00
committed by Space Team
parent 7bd5491498
commit 50f82c9094
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirBuilderInferenceSession.kt
+2 -3
View File
@@ -155,9 +155,8 @@ class FirBuilderInferenceSession(
val commonSystem = components.session.inferenceComponents.createConstraintSystem() val commonSystem = components.session.inferenceComponents.createConstraintSystem()
val nonFixedToVariablesSubstitutor = createNonFixedTypeToVariableSubstitutor() val nonFixedToVariablesSubstitutor = createNonFixedTypeToVariableSubstitutor()
integrateConstraints(commonSystem, initialStorage, nonFixedToVariablesSubstitutor, false) var effectivelyEmptyCommonSystem =
!integrateConstraints(commonSystem, initialStorage, nonFixedToVariablesSubstitutor, false)
var effectivelyEmptyCommonSystem = true
for ((_, candidate) in commonCalls) { for ((_, candidate) in commonCalls) {
val hasConstraints = val hasConstraints =
compiler/testData/diagnostics/testsWithStdLib/builderInference/inferenceFromLambdaReturnType.fir.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ FILE: inferenceFromLambdaReturnType.kt
public final fun <S> getWithFallback(fallback: R|(ThemeKey<S>) -> S|): R|kotlin/Unit| { public final fun <S> getWithFallback(fallback: R|(ThemeKey<S>) -> S|): R|kotlin/Unit| {
} }
public final fun main(): R|kotlin/Unit| { public final fun main(): R|kotlin/Unit| {
R|/getWithFallback|<R|kotlin/String|>(<L> = getWithFallback@fun <anonymous>(it: R|ThemeKey<ERROR CLASS: Type for S is not inferred>|): R|kotlin/String| <inline=NoInline> { R|/getWithFallback|<R|kotlin/String|>(<L> = getWithFallback@fun <anonymous>(it: R|ThemeKey<kotlin/String>|): R|kotlin/String| <inline=NoInline> {
^ String() ^ String()
} }
) )