commit dce37bdb82a356bcac13b4b0a05df67af192a15f
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Oct 10 14:46:17 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 10 14:46:17 2018 +0000
tree f494544e7b0e3418dffc4a29f4aac1661cfe8c3b
parent db7b8394f39cd6f085b4678620344cba9f7a6c2c
parent 6d8a42f283333a61a4c0f16b6cd6d1f2ea084cac

Merge "Mark assertion errors suppressed"

src/main/java/com/android/tools/r8/utils/ExceptionUtils.java

diff --git a/src/main/java/com/android/tools/r8/utils/ExceptionUtils.java b/src/main/java/com/android/tools/r8/utils/ExceptionUtils.java
index d77adfd..8fa85bf 100644
--- a/src/main/java/com/android/tools/r8/utils/ExceptionUtils.java
+++ b/src/main/java/com/android/tools/r8/utils/ExceptionUtils.java
@@ -65,7 +65,7 @@
       } catch (ResourceException e) {
         throw reporter.fatalError(new ExceptionDiagnostic(e, e.getOrigin()));
       } catch (AssertionError e) {
-        throw reporter.fatalError(new ExceptionDiagnostic(e, Origin.unknown()));
+        throw reporter.fatalError(new ExceptionDiagnostic(e, Origin.unknown()), e);
       }
       reporter.failIfPendingErrors();
     } catch (AbortException e) {

src/main/java/com/android/tools/r8/utils/Reporter.java

diff --git a/src/main/java/com/android/tools/r8/utils/Reporter.java b/src/main/java/com/android/tools/r8/utils/Reporter.java
index 5a1bd06..928058e 100644
--- a/src/main/java/com/android/tools/r8/utils/Reporter.java
+++ b/src/main/java/com/android/tools/r8/utils/Reporter.java
@@ -108,7 +108,7 @@
   }
 
   private <T extends Throwable> T addSuppressedExceptions(T t) {
-    suppressedExceptions.forEach(throwable -> t.addSuppressed(throwable));
+    suppressedExceptions.forEach(t::addSuppressed);
     return t;
   }