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

New J2K: fix SOE in inference processing for star-projection as type argument

Browse Source 
#KT-33942 fixed
#KT-33941 fixed
This commit is contained in:
Ilya Kirillov
2019-10-11 12:03:07 +03:00
parent b350515237
commit 1ec620b753
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/inference/common/BoundTypeCalculator.kt
+6 -5
View File
@@ -204,16 +204,17 @@ open class BoundTypeCalculatorImpl(
BoundTypeImpl( BoundTypeImpl(
typeVariable?.let { TypeVariableLabel(it) } ?: GenericLabel(target.classReference), typeVariable?.let { TypeVariableLabel(it) } ?: GenericLabel(target.classReference),
arguments.mapIndexed { i, argument -> arguments.mapIndexed { i, argument ->
TypeParameter( val argumentBoundType = when {
argument.type.boundTypeUnenhanced( argument.isStarProjection -> BoundType.STAR_PROJECTION
else -> argument.type.boundTypeUnenhanced(
typeVariable?.typeParameters?.getOrNull(i)?.boundType?.label?.safeAs<TypeVariableLabel>()?.typeVariable, typeVariable?.typeParameters?.getOrNull(i)?.boundType?.label?.safeAs<TypeVariableLabel>()?.typeVariable,
contextBoundType, contextBoundType,
call, call,
isImplicitReceiver, isImplicitReceiver,
inferenceContext inferenceContext
) ?: return null, ) ?: return null
constructor.parameters[i].variance }
) TypeParameter(argumentBoundType, constructor.parameters[i].variance)
} }
) )
nj2k/testData/inference/nullability/javaStream.kt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ import java.util.stream.Stream
fun test(list: /*T1@*/List</*T0@*/String>) { fun test(list: /*T1@*/List</*T0@*/String>) {
val x: /*T9@*/List</*T8@*/String> = list/*T1@List<T0@String>*/.stream()/*Stream<T0@String>!!L*/ val x: /*T9@*/List</*T8@*/String> = list/*T1@List<T0@String>*/.stream()/*Stream<T0@String>!!L*/
.map</*T3@*/String>({ x: /*T2@*/String -> x/*T2@String*/ + ""/*LIT*//*LIT*/ }/*Function1<T2@String, T10@String>!!L*/)/*Stream<T3@String>*/ .map</*T3@*/String>({ x: /*T2@*/String -> x/*T2@String*/ + ""/*LIT*//*LIT*/ }/*Function1<T2@String, T10@String>!!L*/)/*Stream<T3@String>*/
.collect</*T6@*/List</*T5@*/String>, /*T7@*/Any>(Collectors/*LIT*/.toList</*T4@*/String>()/*Collector<T4@String, Any, MutableList<T4@String>>*/)/*T6@List<T5@String>*/ .collect</*T6@*/List</*T5@*/String>, /*T7@*/Any>(Collectors/*LIT*/.toList</*T4@*/String>()/*Collector<T4@String, *, MutableList<T4@String>>*/)/*T6@List<T5@String>*/
} }