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

IR: check whether local declarations need to throw after Nothing return

Browse Source 
^KT-48982 Fixed
This commit is contained in:
pyos
2021-10-06 13:56:04 +02:00
committed by Ilmir Usmanov
parent a213dad9ab
commit 226306ac83
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/KotlinNothingValueExceptionLowering.kt
+7
View File
@@ -7,8 +7,10 @@ package org.jetbrains.kotlin.backend.common.lower
import org.jetbrains.kotlin.backend.common.BodyLoweringPass
import org.jetbrains.kotlin.backend.common.CommonBackendContext
import org.jetbrains.kotlin.backend.common.runOnFilePostfix
import org.jetbrains.kotlin.ir.builders.irCall
import org.jetbrains.kotlin.ir.declarations.IrDeclaration
import org.jetbrains.kotlin.ir.declarations.IrFile
import org.jetbrains.kotlin.ir.expressions.IrBody
import org.jetbrains.kotlin.ir.expressions.IrCall
import org.jetbrains.kotlin.ir.expressions.IrExpression
@@ -20,6 +22,9 @@ import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
class KotlinNothingValueExceptionLowering(
val backendContext: CommonBackendContext, val skip: (IrDeclaration) -> Boolean = { false }
) : BodyLoweringPass {
override fun lower(irFile: IrFile) =
runOnFilePostfix(irFile, withLocalDeclarations = true)
override fun lower(irBody: IrBody, container: IrDeclaration) {
if (!skip(container)) {
irBody.transformChildrenVoid(Transformer(container.symbol))
@@ -27,6 +32,8 @@ class KotlinNothingValueExceptionLowering(
}
private inner class Transformer(val parent: IrSymbol) : IrElementTransformerVoid() {
override fun visitBody(body: IrBody): IrBody = body
override fun visitCall(expression: IrCall): IrExpression =
if (expression.type.isNothing()) {
// Replace call 'foo' of type 'kotlin.Nothing' with a block: