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

Use original descriptors on implicit coercion to unit generation

Browse Source
This commit is contained in:
Mikhael Bogdanov
2018-08-14 16:02:27 +03:00
parent e01e832acd
commit 6d915bd68c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/transformations/InsertImplicitCasts.kt
+6 -1
View File
@@ -233,7 +233,7 @@ class InsertImplicitCasts(context: GeneratorContext) : IrElementTransformerVoid(
} }
private fun IrExpression.coerceToUnit(): IrExpression { private fun IrExpression.coerceToUnit(): IrExpression {
val valueType = this.type.originalKotlinType!! val valueType = getKotlinType(this)
return if (KotlinTypeChecker.DEFAULT.isSubtypeOf(valueType, builtIns.unitType)) return if (KotlinTypeChecker.DEFAULT.isSubtypeOf(valueType, builtIns.unitType))
this this
@@ -247,6 +247,11 @@ class InsertImplicitCasts(context: GeneratorContext) : IrElementTransformerVoid(
) )
} }
private fun getKotlinType(irExpression: IrExpression) =
if (irExpression is IrCall)
irExpression.symbol.descriptor.original.returnType!!
else irExpression.type.originalKotlinType!!
private fun KotlinType.isBuiltInIntegerType(): Boolean = private fun KotlinType.isBuiltInIntegerType(): Boolean =
KotlinBuiltIns.isByte(this) || KotlinBuiltIns.isByte(this) ||
KotlinBuiltIns.isShort(this) || KotlinBuiltIns.isShort(this) ||