commit 241b866a3afc17b84051c884769598c85b31b372
author Søren Gjesse <sgjesse@google.com> Wed Oct 10 14:14:15 2018 +0200
committer Søren Gjesse <sgjesse@google.com> Wed Oct 10 14:14:15 2018 +0200
tree 63f8d1a00c52c240458bf755a5ac25142e1b0636
parent d3a480b946592115f821db9989017cceec51467f

Fix stack trace parsing in retrace test

Tested on all Art/Dalvik versions used for testing.

Change-Id: I8e2c02e3bc3bc2283adf19179f7c31ed1c363661

src/test/java/com/android/tools/r8/naming/retrace/RetraceTest.java

diff --git a/src/test/java/com/android/tools/r8/naming/retrace/RetraceTest.java b/src/test/java/com/android/tools/r8/naming/retrace/RetraceTest.java
index 7ef1c3f..e1c61c1 100644
--- a/src/test/java/com/android/tools/r8/naming/retrace/RetraceTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retrace/RetraceTest.java
@@ -13,6 +13,7 @@
 import com.android.tools.r8.R8Command;
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.ToolHelper.DexVm;
 import com.android.tools.r8.ToolHelper.ProcessResult;
 import com.android.tools.r8.origin.Origin;
 import com.android.tools.r8.utils.AndroidApp;
@@ -61,17 +62,47 @@
     return StringUtils.splitLines(ToolHelper.runRetrace(mapFile, stackTraceFile));
   }
 
+  private boolean isDalvik() {
+    return backend == Backend.DEX && ToolHelper.getDexVm().isOlderThanOrEqual(DexVm.ART_4_4_4_HOST);
+  }
+
   private List<String> extractStackTrace(ProcessResult result) {
     ImmutableList.Builder<String> builder = ImmutableList.builder();
     List<String> stderr = StringUtils.splitLines(result.stderr);
     Iterator<String> iterator = stderr.iterator();
-    while (iterator.hasNext()) {
-      String line = iterator.next();
-      if (line.startsWith("Exception in thread \"main\"")) {
-        break;
-      }
+
+    // A Dalvik stacktrace looks like this:
+    // W(209693) threadid=1: thread exiting with uncaught exception (group=0xf616cb20)  (dalvikvm)
+    // java.lang.NullPointerException
+    // \tat com.android.tools.r8.naming.retrace.Main.a(:133)
+    // \tat com.android.tools.r8.naming.retrace.Main.a(:139)
+    // \tat com.android.tools.r8.naming.retrace.Main.main(:145)
+    // \tat dalvik.system.NativeStart.main(Native Method)
+    //
+    // An Art 5.1.1 and 6.0.1 stacktrace looks like this:
+    // java.lang.NullPointerException: throw with null exception
+    // \tat com.android.tools.r8.naming.retrace.Main.a(:154)
+    // \tat com.android.tools.r8.naming.retrace.Main.a(:160)
+    // \tat com.android.tools.r8.naming.retrace.Main.main(:166)
+    //
+    // An Art 7.0.0 and latest stacktrace looks like this:
+    // Exception in thread "main" java.lang.NullPointerException: throw with null exception
+    // \tat com.android.tools.r8.naming.retrace.Main.a(:150)
+    // \tat com.android.tools.r8.naming.retrace.Main.a(:156)
+    // \tat com.android.tools.r8.naming.retrace.Main.main(:162)
+    int last = stderr.size();
+    if (isDalvik()) {
+      // Skip the bottom frame "dalvik.system.NativeStart.main".
+      last--;
     }
-    iterator.forEachRemaining(builder::add);
+    // Take all lines from the bottom starting with "\tat ".
+    int first = last;
+    while (first - 1 >= 0 && stderr.get(first - 1).startsWith("\tat ")) {
+      first--;
+    }
+    for (int i = first; i < last; i++) {
+      builder.add(stderr.get(i));
+    }
     return builder.build();
   }