commit b7edda56479396df7a08dc04d00a55ed8388f904
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Jun 08 14:45:19 2022 +0200
committer Christoffer Adamsen <christofferqa@google.com> Wed Jun 08 14:36:39 2022 +0000
tree edd3ac19e34fd2b947a4da1d3550bd7d8cb1bc20
parent 969a84ab07ac67f7f4c1eb8fbdd44edfdfbbb03c

Include context in synthetic equivalence when instrumentation is enabled

Change-Id: I7a5040bba90b1704b24fa8dce3e9b8e6c4b12a73

src/main/java/com/android/tools/r8/synthesis/SyntheticFinalization.java

diff --git a/src/main/java/com/android/tools/r8/synthesis/SyntheticFinalization.java b/src/main/java/com/android/tools/r8/synthesis/SyntheticFinalization.java
index 86206f6..eb764c0 100644
--- a/src/main/java/com/android/tools/r8/synthesis/SyntheticFinalization.java
+++ b/src/main/java/com/android/tools/r8/synthesis/SyntheticFinalization.java
@@ -642,11 +642,13 @@
       boolean mustBeRepresentative = isPinned(appView, synthetic);
       EquivalenceGroup<T> equivalenceGroup = null;
       for (EquivalenceGroup<T> group : groups) {
+        boolean includeContext =
+            intermediate || appView.options().getStartupOptions().isStartupInstrumentationEnabled();
         if (synthetic.isEquivalentTo(
             group.hasRepresentative()
                 ? group.getRepresentative()
                 : group.getFirstNonRepresentativeMember(),
-            intermediate,
+            includeContext,
             appView.graphLens(),
             classToFeatureSplitMap)) {
           if (mustBeRepresentative && group.hasRepresentative()) {