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

Removed unnecessary check to prevent infinite recursion in incorporation

Browse Source
This commit is contained in:
Svetlana Isakova
2015-07-07 21:32:20 +03:00
parent 92e7ed0425
commit 4701310852
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.bounds
Vendored
+3 -3
View File
@@ -4,11 +4,11 @@ EQUAL T Int
EQUAL T My<T> EQUAL T My<T>
type parameter bounds: type parameter bounds:
T := Int, := My<T>* T := Int, := My<T>*, := My<Int>
status: status:
-hasCannotCaptureTypesError: false -hasCannotCaptureTypesError: false
-hasConflictingConstraints: false -hasConflictingConstraints: true
-hasContradiction: true -hasContradiction: true
-hasErrorInConstrainingTypes: false -hasErrorInConstrainingTypes: false
-hasTypeConstructorMismatch: false -hasTypeConstructorMismatch: false
@@ -18,4 +18,4 @@ status:
-isSuccessful: false -isSuccessful: false
result: result:
T=Int T=???
core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/constraintIncorporation.kt
-3
View File
@@ -75,9 +75,6 @@ private fun ConstraintSystemImpl.generateNewBound(bound: Bound, substitution: Bo
// Here <=> means lower_bound, upper_bound or exact_bound constraint. // Here <=> means lower_bound, upper_bound or exact_bound constraint.
// Then a new bound 'T <=> My<_/in/out Type>' can be generated. // Then a new bound 'T <=> My<_/in/out Type>' can be generated.
// We don't substitute anything into recursive constraints
if (substitution.typeVariable == bound.typeVariable) return
val substitutedType = when (substitution.kind) { val substitutedType = when (substitution.kind) {
EXACT_BOUND -> substitution.constrainingType EXACT_BOUND -> substitution.constrainingType
UPPER_BOUND -> CapturedType(TypeProjectionImpl(Variance.OUT_VARIANCE, substitution.constrainingType)) UPPER_BOUND -> CapturedType(TypeProjectionImpl(Variance.OUT_VARIANCE, substitution.constrainingType))