diff options
| author | Benoit Lamarche <benoitlamarche@google.com> | 2014-12-01 17:07:44 +0100 |
|---|---|---|
| committer | Benoit Lamarche <benoitlamarche@google.com> | 2014-12-01 17:41:40 +0100 |
| commit | 9188062cf4b70b45d2244809f9de8d38abb14b13 (patch) | |
| tree | 6d41d0f117618635d6ee8fd71c9c9723129b2bf5 /jack/src | |
| parent | f9f8bef0b5a7b34e261c07677e07232570fd393d (diff) | |
| download | toolchain_jack-9188062cf4b70b45d2244809f9de8d38abb14b13.zip toolchain_jack-9188062cf4b70b45d2244809f9de8d38abb14b13.tar.gz toolchain_jack-9188062cf4b70b45d2244809f9de8d38abb14b13.tar.bz2 | |
Always print stacktrace of internal compilation exceptions
Change-Id: Iddf05e3d6c4e70f87f535915d6a58ada168c7056
Diffstat (limited to 'jack/src')
| -rw-r--r-- | jack/src/com/android/jack/CommandLine.java | 11 | ||||
| -rw-r--r-- | jack/src/com/android/jack/experimental/incremental/JackIncremental.java | 11 |
2 files changed, 16 insertions, 6 deletions
diff --git a/jack/src/com/android/jack/CommandLine.java b/jack/src/com/android/jack/CommandLine.java index 2f7df09..04c5b2d 100644 --- a/jack/src/com/android/jack/CommandLine.java +++ b/jack/src/com/android/jack/CommandLine.java @@ -113,10 +113,15 @@ public abstract class CommandLine { logger.log(Level.FINE, "Jack fatal exception:", e); System.exit(ExitStatus.FAILURE_COMPILATION); } catch (Throwable e) { - String message = "Internal compiler error (version " + Jack.getVersionString() + ")"; - System.err.println(message + '.'); + String info = "Internal compiler error (version " + Jack.getVersionString() + ")"; + logger.log(Level.SEVERE, info + ':', e); + e.printStackTrace(); + System.err.println(); + System.err.println(info + '.'); + if (e.getMessage() != null) { + System.err.println(e.getMessage() + '.'); + } System.err.println(INTERRUPTED_COMPILATION_WARNING); - logger.log(Level.SEVERE, message + ':', e); System.exit(ExitStatus.FAILURE_INTERNAL); } } diff --git a/jack/src/com/android/jack/experimental/incremental/JackIncremental.java b/jack/src/com/android/jack/experimental/incremental/JackIncremental.java index 5c257f0..788b287 100644 --- a/jack/src/com/android/jack/experimental/incremental/JackIncremental.java +++ b/jack/src/com/android/jack/experimental/incremental/JackIncremental.java @@ -154,11 +154,16 @@ public class JackIncremental extends CommandLine { logger.log(Level.FINE, "Unrecoverable exception:", e); System.exit(ExitStatus.FAILURE_UNRECOVERABLE); } catch (Throwable e) { - String message = + String info = "Internal incremental compiler error (version " + Jack.getVersionString() + ")"; - System.err.println(message + '.'); + logger.log(Level.SEVERE, info + ':', e); + e.printStackTrace(); + System.err.println(); + System.err.println(info + '.'); + if (e.getMessage() != null) { + System.err.println(e.getMessage() + '.'); + } System.err.println(INTERRUPTED_COMPILATION_WARNING); - logger.log(Level.SEVERE, message + ':', e); System.exit(ExitStatus.FAILURE_INTERNAL); } } |