FIR Java: add nullable (instead of not-null) type parameter bounds

This commit is contained in:
Mikhail Glukhikh
2019-11-11 14:18:02 +03:00
parent db11c14fee
commit c657d46437
22 changed files with 28 additions and 28 deletions
@@ -136,7 +136,7 @@ class JavaSymbolProvider(
) {
require(this is FirTypeParameterImpl)
for (upperBound in javaTypeParameter.upperBounds) {
bounds += upperBound.toFirResolvedTypeRef(this@JavaSymbolProvider.session, stack)
bounds += upperBound.toFirResolvedTypeRef(this@JavaSymbolProvider.session, stack, isNullable = true)
}
addDefaultBoundIfNecessary()
}
@@ -93,9 +93,9 @@ internal fun JavaType.toFirJavaTypeRef(session: FirSession, javaTypeParameterSta
}
internal fun JavaClassifierType.toFirResolvedTypeRef(
session: FirSession, javaTypeParameterStack: JavaTypeParameterStack
session: FirSession, javaTypeParameterStack: JavaTypeParameterStack, isNullable: Boolean = false
): FirResolvedTypeRef {
val coneType = this.toConeKotlinTypeWithNullability(session, javaTypeParameterStack, isNullable = false)
val coneType = this.toConeKotlinTypeWithNullability(session, javaTypeParameterStack, isNullable)
return FirResolvedTypeRefImpl(
source = null, type = coneType
).apply {