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

Fix check isCapturedTypeFromSubtyping to support KotlinTypeMarkers

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-04-17 17:56:29 +03:00
parent aabc9fa10f
commit db8bd8c197
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintInjector.kt
+1 -1
View File
@@ -154,7 +154,7 @@ class ConstraintInjector(val constraintIncorporator: ConstraintIncorporator, val
addConstraint(typeVariable, subType, LOWER) addConstraint(typeVariable, subType, LOWER)
private fun isCapturedTypeFromSubtyping(type: KotlinTypeMarker) = private fun isCapturedTypeFromSubtyping(type: KotlinTypeMarker) =
when ((type as? NewCapturedType)?.captureStatus) { when ((type as? CapturedTypeMarker)?.captureStatus()) {
null, CaptureStatus.FROM_EXPRESSION -> false null, CaptureStatus.FROM_EXPRESSION -> false
CaptureStatus.FOR_SUBTYPING -> true CaptureStatus.FOR_SUBTYPING -> true
CaptureStatus.FOR_INCORPORATION -> CaptureStatus.FOR_INCORPORATION ->