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

IrTypes: approximate only non-denotable Kotlin types

Browse Source
This commit is contained in:
Dmitry Petrov
2018-05-30 11:49:09 +03:00
parent 93f4a4da10
commit 2d9ae6e93e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt
+6 -1
View File
@@ -45,7 +45,12 @@ class TypeTranslator(
private fun translateType(ktType0: KotlinType, variance: Variance): IrTypeProjection { private fun translateType(ktType0: KotlinType, variance: Variance): IrTypeProjection {
// TODO "old" JVM BE does this for reified type arguments. Is it ok for arbitrary subexpressions? // TODO "old" JVM BE does this for reified type arguments. Is it ok for arbitrary subexpressions?
val ktTypeUpper = approximateCapturedTypes(ktType0).upper
val ktTypeUpper =
if (ktType0.constructor.isDenotable)
ktType0
else
approximateCapturedTypes(ktType0).upper
when { when {
ktTypeUpper.isError -> return IrErrorTypeImpl(ktTypeUpper, translateTypeAnnotations(ktTypeUpper.annotations), variance) ktTypeUpper.isError -> return IrErrorTypeImpl(ktTypeUpper, translateTypeAnnotations(ktTypeUpper.annotations), variance)