commit f65591bf79dc8031d7af15477cff5d0f36d56579
author Ian Zerny <zerny@google.com> Tue May 22 10:38:02 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 22 10:38:02 2018 +0000
tree ec83720727e2856a9bf1f0d759371c19f1c1c192
parent 20c7c20a9c90f6b927f218d91943f73732362b11
parent 1420fa958f6ceb1686b839e5ddd51c14c641467e

Merge "Extract optional origin and position when throwing abort exception."

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 63b95b3..ebb7ce6 100644
--- a/src/main/java/com/android/tools/r8/utils/Reporter.java
+++ b/src/main/java/com/android/tools/r8/utils/Reporter.java
@@ -8,6 +8,8 @@
 import com.android.tools.r8.DiagnosticsHandler;
 import com.android.tools.r8.errors.CompilationError;
 import com.android.tools.r8.errors.Unreachable;
+import com.android.tools.r8.origin.Origin;
+import com.android.tools.r8.position.Position;
 import java.util.ArrayList;
 import java.util.Collection;
 
@@ -80,7 +82,15 @@
       if (errorCount != 0) {
         AbortException abort;
         if (lastError != null && lastError.getDiagnosticMessage() != null) {
-          abort = new AbortException("Error: " + lastError.getDiagnosticMessage());
+          StringBuilder builder = new StringBuilder("Error: ");
+          if (lastError.getOrigin() != Origin.unknown()) {
+            builder.append(lastError.getOrigin()).append(", ");
+          }
+          if (lastError.getPosition() != Position.UNKNOWN) {
+            builder.append(lastError.getPosition()).append(", ");
+          }
+          builder.append(lastError.getDiagnosticMessage());
+          abort = new AbortException(builder.toString());
         } else {
           abort = new AbortException();
         }