commit 85a4ba0967ccf9aa07db3df0f23c0b58845c3ac4
author Morten Krogh-Jespersen <mkroghj@google.com> Wed Sep 07 11:33:56 2022 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Wed Sep 07 12:41:10 2022 +0000
tree b3ed5785707b69fa178c83c720ea13398f9c7695
parent 162e47bad69dda0e376e51faeb3c6287f3b4fe32

Only add marker if we have CF input in D8

Change-Id: Id503d556add3735b387a65b8f4ba8dd3155ab83a

src/main/java/com/android/tools/r8/D8.java

diff --git a/src/main/java/com/android/tools/r8/D8.java b/src/main/java/com/android/tools/r8/D8.java
index 74a3d20..068f2ec 100644
--- a/src/main/java/com/android/tools/r8/D8.java
+++ b/src/main/java/com/android/tools/r8/D8.java
@@ -274,7 +274,7 @@
       boolean hasClassResources = appView.appInfo().app().getFlags().hasReadProgramClassFromCf();
       boolean hasDexResources = appView.appInfo().app().getFlags().hasReadProgramClassFromDex();
 
-      Marker marker = options.getMarker(Tool.D8);
+      Marker marker = hasClassResources ? options.getMarker(Tool.D8) : null;
 
       timing.time(
           "Run inspections",

src/test/java/com/android/tools/r8/d8/D8FrameworkDexPassthroughMarkerTest.java

diff --git a/src/test/java/com/android/tools/r8/d8/D8FrameworkDexPassthroughMarkerTest.java b/src/test/java/com/android/tools/r8/d8/D8FrameworkDexPassthroughMarkerTest.java
index e17ac14..0370c29 100644
--- a/src/test/java/com/android/tools/r8/d8/D8FrameworkDexPassthroughMarkerTest.java
+++ b/src/test/java/com/android/tools/r8/d8/D8FrameworkDexPassthroughMarkerTest.java
@@ -11,7 +11,6 @@
 import com.android.tools.r8.dex.Marker;
 import com.android.tools.r8.dex.Marker.Tool;
 import com.android.tools.r8.graph.DexApplication;
-import com.android.tools.r8.graph.DexString;
 import com.android.tools.r8.utils.AndroidApiLevel;
 import com.android.tools.r8.utils.AndroidApp;
 import com.android.tools.r8.utils.InternalOptions;
@@ -29,7 +28,8 @@
 
 /**
  * Simple test that compiles framework.jar with D8 a number of times with various number of threads
- * available to the compiler. This test also tests the hidden marker inserted into classes.dex.
+ * available to the compiler. This test also tests that no hidden marker is inserted into
+ * classes.dex.
  */
 @RunWith(Parameterized.class)
 public class D8FrameworkDexPassthroughMarkerTest {
@@ -62,15 +62,10 @@
     Marker marker = new Marker(Tool.D8)
         .setVersion("1.0.0")
         .setMinApi(minApi);
-    InternalOptions options = new InternalOptions();
-    DexString markerDexString = options.itemFactory.createString(marker.toString());
-    Marker selfie = Marker.parse(markerDexString);
-    assert marker.equals(selfie);
     AndroidApp app = ToolHelper.runD8(command, opts -> opts.setMarker(marker));
-    DexApplication dexApp = new ApplicationReader(app, options, Timing.empty()).read();
+    DexApplication dexApp =
+        new ApplicationReader(app, new InternalOptions(), Timing.empty()).read();
     Collection<Marker> markers = dexApp.dexItemFactory.extractMarkers();
-    assertEquals(1, markers.size());
-    Marker readMarker = markers.iterator().next();
-    assertEquals(marker, readMarker);
+    assertEquals(0, markers.size());
   }
 }