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

Codegen: optimization of catch (t: Throwable) {}

Browse Source
This commit is contained in:
Igor Chevdar
2017-05-04 14:16:58 +05:00
parent 39c6aa0f2c
commit 8fbc06809a
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
+20 -10
View File
@@ -885,21 +885,31 @@ internal class CodeGeneratorVisitor(val context: Context) : IrElementVisitorVoid
private val success: ContinuationBlock) : CatchingScope() {
override fun genHandler(exception: LLVMValueRef) {
// TODO: optimize for `Throwable` clause.
catches.forEach {
val isInstance = genInstanceOf(exception, it.parameter.type)
val nextCheck = codegen.basicBlock("catchCheck")
val body = codegen.basicBlock("catch")
codegen.condBr(isInstance, body, nextCheck)
codegen.appendingTo(body) {
for (catch in catches) {
fun genCatchBlock() {
using(VariableScope()) {
currentCodeContext.genDeclareVariable(it.parameter, exception)
evaluateExpressionAndJump(it.result, success)
currentCodeContext.genDeclareVariable(catch.parameter, exception)
evaluateExpressionAndJump(catch.result, success)
}
}
codegen.positionAtEnd(nextCheck)
if (catch.parameter.type == context.builtIns.throwable.defaultType) {
genCatchBlock()
return // Remaining catch clauses are unreachable.
} else {
val isInstance = genInstanceOf(exception, catch.parameter.type)
val body = codegen.basicBlock("catch")
val nextCheck = codegen.basicBlock("catchCheck")
codegen.condBr(isInstance, body, nextCheck)
codegen.appendingTo(body) {
genCatchBlock()
}
codegen.positionAtEnd(nextCheck)
}
}
// rethrow the exception if no clause can handle it.
outerContext.genThrow(exception)