IR: wrap exceptions and add file path in per-file lowerings

Also add file path to the wrapped exception in JVM IR codegen
This commit is contained in:
Alexander Udalov
2019-11-28 19:17:30 +01:00
parent fd627603a0
commit 2552540f71
7 changed files with 27 additions and 66 deletions
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.backend.common.phaser
import org.jetbrains.kotlin.backend.common.CodegenUtil
import org.jetbrains.kotlin.backend.common.CommonBackendContext
import org.jetbrains.kotlin.backend.common.FileLoweringPass
import org.jetbrains.kotlin.backend.common.lower
@@ -174,7 +175,11 @@ fun <Context : CommonBackendContext> performByIrFile(
input: IrModuleFragment
): IrModuleFragment {
for (irFile in input.files) {
lower.invoke(phaseConfig, phaserState.changeType(), context, irFile)
try {
lower.invoke(phaseConfig, phaserState.changeType(), context, irFile)
} catch (e: Throwable) {
CodegenUtil.reportBackendException(e, "IR lowering", irFile.fileEntry.name)
}
}
// TODO: no guarantee that module identity is preserved by `lower`
@@ -5,13 +5,13 @@
package org.jetbrains.kotlin.backend.jvm
import org.jetbrains.kotlin.backend.common.CodegenUtil
import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
import org.jetbrains.kotlin.backend.jvm.codegen.ClassCodegen
import org.jetbrains.kotlin.backend.jvm.lower.MultifileFacadeFileEntry
import org.jetbrains.kotlin.backend.jvm.serialization.JvmMangler
import org.jetbrains.kotlin.codegen.CompilationErrorHandler
import org.jetbrains.kotlin.codegen.state.GenerationState
import org.jetbrains.kotlin.ir.declarations.IrClass
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
@@ -71,11 +71,7 @@ object JvmBackendFacade {
context.typeMapper.mapType(context.referenceClass(descriptor).defaultType)
}
try {
JvmLower(context).lower(irModuleFragment)
} catch (e: Throwable) {
CompilationErrorHandler.reportException(e, null)
}
JvmLower(context).lower(irModuleFragment)
for (generateMultifileFacade in listOf(true, false)) {
for (irFile in irModuleFragment.files) {
@@ -95,7 +91,7 @@ object JvmBackendFacade {
}
state.afterIndependentPart()
} catch (e: Throwable) {
CompilationErrorHandler.reportException(e, null) // TODO ktFile.virtualFile.url
CodegenUtil.reportBackendException(e, "code generation", irFile.fileEntry.name)
}
}
}