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

Check also the cause of throwable for OOM exception

Browse Source 
Sometimes OOM exception is the cause of some higher-level one
exception in compilation.

^KT-51116 Fixed
This commit is contained in:
Yahor Berdnikau
2022-02-03 13:24:53 +01:00
committed by Space
parent 5b79279590
commit 5320a32d67
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.kt
+6 -1
View File
@@ -121,12 +121,17 @@ abstract class CLICompiler<A : CommonCompilerArguments> : CLITool<A>() {
return COMPILATION_ERROR return COMPILATION_ERROR
} catch (t: Throwable) { } catch (t: Throwable) {
MessageCollectorUtil.reportException(collector, t) MessageCollectorUtil.reportException(collector, t)
return if (t is OutOfMemoryError) OOM_ERROR else INTERNAL_ERROR return if (t is OutOfMemoryError || t.hasOOMCause()) OOM_ERROR else INTERNAL_ERROR
} finally { } finally {
collector.flush() collector.flush()
} }
} }
private fun Throwable.hasOOMCause(): Boolean = when (cause) {
is OutOfMemoryError -> true
else -> cause?.hasOOMCause() ?: false
}
private fun MessageCollector.reportCompilationCancelled(e: CompilationCanceledException) { private fun MessageCollector.reportCompilationCancelled(e: CompilationCanceledException) {
if (e !is IncrementalNextRoundException) { if (e !is IncrementalNextRoundException) {
report(INFO, "Compilation was canceled", null) report(INFO, "Compilation was canceled", null)