commit 42f9d5566fd9a449f3207f5f288394f3f0904267
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Sep 20 18:19:36 2021 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Sep 20 18:19:36 2021 +0200
tree df3ba1d965592c8823df94df9c8df9ab238bb27f
parent 533d6f3f069aab2647b76ec817112e10508cc53a

[Retrace] Check for position >= 0

Change-Id: If1d39c4b6302fcf92f1d8d30f62f022bb768b6c5

src/main/java/com/android/tools/r8/retrace/internal/RetraceClassResultImpl.java

diff --git a/src/main/java/com/android/tools/r8/retrace/internal/RetraceClassResultImpl.java b/src/main/java/com/android/tools/r8/retrace/internal/RetraceClassResultImpl.java
index d00578a..54c90e6 100644
--- a/src/main/java/com/android/tools/r8/retrace/internal/RetraceClassResultImpl.java
+++ b/src/main/java/com/android/tools/r8/retrace/internal/RetraceClassResultImpl.java
@@ -171,7 +171,7 @@
       return overloadedRanges;
     }
     List<MappedRange> mappedRangesForPosition = null;
-    if (position.isPresent()) {
+    if (position.isPresent() && position.get() >= 0) {
       mappedRangesForPosition = mappedRanges.allRangesForLine(position.get(), false);
     }
     if (mappedRangesForPosition == null || mappedRangesForPosition.isEmpty()) {

src/main/java/com/android/tools/r8/retrace/internal/RetraceFrameResultImpl.java

diff --git a/src/main/java/com/android/tools/r8/retrace/internal/RetraceFrameResultImpl.java b/src/main/java/com/android/tools/r8/retrace/internal/RetraceFrameResultImpl.java
index 1742a72..2f79d8e 100644
--- a/src/main/java/com/android/tools/r8/retrace/internal/RetraceFrameResultImpl.java
+++ b/src/main/java/com/android/tools/r8/retrace/internal/RetraceFrameResultImpl.java
@@ -132,7 +132,8 @@
       MethodReference methodReference,
       MappedRange mappedRange,
       Optional<Integer> obfuscatedPosition) {
-    if (mappedRange.minifiedRange == null || (!obfuscatedPosition.isPresent() && !isAmbiguous())) {
+    if (mappedRange.minifiedRange == null
+        || (obfuscatedPosition.orElse(-1) == -1 && !isAmbiguous())) {
       int originalLineNumber = mappedRange.getFirstLineNumberOfOriginalRange();
       if (originalLineNumber > 0) {
         return RetracedMethodReferenceImpl.create(methodReference, originalLineNumber);

third_party/retrace/binary_compatibility.tar.gz.sha1

diff --git a/third_party/retrace/binary_compatibility.tar.gz.sha1 b/third_party/retrace/binary_compatibility.tar.gz.sha1
index 36593b2..c3fc5b5 100644
--- a/third_party/retrace/binary_compatibility.tar.gz.sha1
+++ b/third_party/retrace/binary_compatibility.tar.gz.sha1
@@ -1 +1 @@
-92c6da95b7f00222bf8e513b586f42db12771c32
\ No newline at end of file
+8a3bfb12c41dc6fc56545c186729f234f2680b55
\ No newline at end of file