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

NI: Add flexible Nothing to trivial constraints to filter it

Browse Source
This commit is contained in:
victor.petukhov
2019-12-11 16:56:12 +03:00
parent 2d5a05466d
commit 71cb65c064
7 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/TrivialConstraintTypeInferenceOracle.kt
+1 -1
View File
@@ -40,7 +40,7 @@ class TrivialConstraintTypeInferenceOracle(context: TypeSystemInferenceExtension
generatedConstraintType: KotlinTypeMarker,
isSubtype: Boolean
): Boolean {
if (isSubtype && generatedConstraintType.isNothing()) return true
if (isSubtype && (generatedConstraintType.isNothing() || generatedConstraintType.isFlexibleNothing())) return true
if (!isSubtype && generatedConstraintType.isNullableAny()) return true
// If types from constraints that will be used to generate new constraint already contains `Nothing(?)`,