commit 6adb874b0249f82288abce853e91a7d828dc8dc7
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Aug 28 13:44:41 2023 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Aug 28 12:52:47 2023 +0000
tree bcff68e637c1c36103c471fc4fc8ed1f8bbc347a
parent 580d378a0b44efeffbdab1cc404cb05183de5459

Ensure we emit a new position after seeing an outline caller

Bug: b/263357015
Bug: b/293630963
Bug: b/294904638
Change-Id: I10d31404dcc88fec51cb80981b9b62ba67f4a3d1

src/main/java/com/android/tools/r8/graph/DexDebugEventBuilder.java

diff --git a/src/main/java/com/android/tools/r8/graph/DexDebugEventBuilder.java b/src/main/java/com/android/tools/r8/graph/DexDebugEventBuilder.java
index 399d2b7..200e8b4 100644
--- a/src/main/java/com/android/tools/r8/graph/DexDebugEventBuilder.java
+++ b/src/main/java/com/android/tools/r8/graph/DexDebugEventBuilder.java
@@ -258,9 +258,13 @@
         nextPosition.getCallerPosition() != previousPosition.getCallerPosition()
             || nextPosition.getMethod() != previousPosition.getMethod();
     boolean isOutline = nextPosition.isOutline();
-    boolean isOutlineCallee =
-        nextPosition.getOutlineCallee() != null && !nextPosition.getOutlinePositions().isEmpty();
-    if (isNewPosition || isOutline || isOutlineCallee) {
+    boolean isOutlineCallerWithInfo =
+        nextPosition.isOutlineCaller()
+            && nextPosition.getOutlineCallee() != null
+            && !nextPosition.getOutlinePositions().isEmpty();
+    boolean isNoLongerOutlineCaller =
+        previousPosition.isOutlineCaller() && !nextPosition.isOutlineCaller();
+    if (isNewPosition || isOutline || isOutlineCallerWithInfo || isNoLongerOutlineCaller) {
       events.add(factory.createPositionFrame(nextPosition));
     }
     addDefaultEventWithAdvancePcIfNecessary(lineDelta, pcDelta, events, factory);

src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineMappingInformationTest.java

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineMappingInformationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineMappingInformationTest.java
index a51667e..8f8d723 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineMappingInformationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineMappingInformationTest.java
@@ -95,14 +95,10 @@
               assertEquals(5, inspector.allClasses().size());
               assertEquals(expectedStackTrace, stackTrace);
             });
-    String proguardMap = compileResult.getProguardMap();
-
-    if (parameters.isDexRuntime()) {
-      // TODO(b/263357015, b/293630963): Outline information is not reset for new default events.
-      assertEquals(6, StringUtils.occurrences(proguardMap, "com.android.tools.r8.outlineCallsite"));
-    } else {
-      assertEquals(4, StringUtils.occurrences(proguardMap, "com.android.tools.r8.outlineCallsite"));
-    }
+    assertEquals(
+        4,
+        StringUtils.occurrences(
+            compileResult.getProguardMap(), "com.android.tools.r8.outlineCallsite"));
   }
 
   @NoHorizontalClassMerging