commit 021946206639895eff0a6305b43302e583873566
author Ian Zerny <zerny@google.com> Mon Jun 24 11:19:36 2024 +0200
committer Ian Zerny <zerny@google.com> Tue Jun 25 09:15:03 2024 +0000
tree f2f110b3705383efc50810ac41f2850c0c92a22c
parent 601a37568cd1fe086aa70fc5e441061ad5dadb95

[KeepAnno] Make extracted and direct interpretation mutually exclusive

The native extraction ended up reading both the direct annotation in
addition to the extracted one.

Change-Id: Ife5051903e37734e26e6f99ac2ac3066dc538b05

src/test/java/com/android/tools/r8/keepanno/KeepAnnoTestBuilder.java

diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepAnnoTestBuilder.java b/src/test/java/com/android/tools/r8/keepanno/KeepAnnoTestBuilder.java
index e3622d4..9e511d7 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepAnnoTestBuilder.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepAnnoTestBuilder.java
@@ -189,8 +189,8 @@
       // This enables native interpretation of all keep annotations.
       builder.addOptionsModification(
           o -> {
-            o.testing.enableExtractedKeepAnnotations = true;
-            o.testing.enableEmbeddedKeepAnnotations = true;
+            o.testing.enableExtractedKeepAnnotations = isNormalizeEdges();
+            o.testing.enableEmbeddedKeepAnnotations = !isNormalizeEdges();
           });
       // This disables all reading of annotations in the command reader.
       builder.getBuilder().setEnableExperimentalKeepAnnotations(false);