commit 28fda19bfd18c758a5c00749cc62277000513e5c
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Jun 13 08:04:20 2023 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue Jun 13 08:04:20 2023 +0200
tree 69349320edef94f998b55bc87979b90d147fdab7
parent a95e15841dd9078ae24a3b6b20d13c443338a461

Temporarily disable concurrent rewriting of AppInfo

Fixes: b/286966633
Change-Id: Ia7f532618687446528168e44a66fcf8699579ba1

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

diff --git a/src/main/java/com/android/tools/r8/graph/AppView.java b/src/main/java/com/android/tools/r8/graph/AppView.java
index 9848f4b..e294798 100644
--- a/src/main/java/com/android/tools/r8/graph/AppView.java
+++ b/src/main/java/com/android/tools/r8/graph/AppView.java
@@ -963,6 +963,23 @@
         newMemberRebindingLens,
         () -> {
           GraphLens appliedLensInModifiedLens = GraphLens.getIdentityLens();
+          if (appView.hasLiveness()) {
+            appView
+                .withLiveness()
+                .setAppInfo(
+                    appView.appInfoWithLiveness().rewrittenWithLens(application, lens, timing));
+          } else {
+            assert appView.hasClassHierarchy();
+            AppView<AppInfoWithClassHierarchy> appViewWithClassHierarchy =
+                appView.withClassHierarchy();
+            AppInfoWithClassHierarchy appInfo = appViewWithClassHierarchy.appInfo();
+            MainDexInfo rewrittenMainDexInfo =
+                appInfo
+                    .getMainDexInfo()
+                    .rewrittenWithLens(appView.getSyntheticItems(), lens, timing);
+            appViewWithClassHierarchy.setAppInfo(
+                appInfo.rebuildWithMainDexInfo(rewrittenMainDexInfo));
+          }
           ThreadTaskUtils.processTasks(
               executorService,
               appView.options(),
@@ -972,30 +989,6 @@
               new ThreadTask() {
                 @Override
                 public void run(Timing threadTiming) {
-                  if (appView.hasLiveness()) {
-                    appView
-                        .withLiveness()
-                        .setAppInfo(
-                            appView
-                                .appInfoWithLiveness()
-                                .rewrittenWithLens(application, lens, threadTiming));
-                  } else {
-                    assert appView.hasClassHierarchy();
-                    AppView<AppInfoWithClassHierarchy> appViewWithClassHierarchy =
-                        appView.withClassHierarchy();
-                    AppInfoWithClassHierarchy appInfo = appViewWithClassHierarchy.appInfo();
-                    MainDexInfo rewrittenMainDexInfo =
-                        appInfo
-                            .getMainDexInfo()
-                            .rewrittenWithLens(appView.getSyntheticItems(), lens, threadTiming);
-                    appViewWithClassHierarchy.setAppInfo(
-                        appInfo.rebuildWithMainDexInfo(rewrittenMainDexInfo));
-                  }
-                }
-              },
-              new ThreadTask() {
-                @Override
-                public void run(Timing threadTiming) {
                   appView.setAppServices(
                       appView.appServices().rewrittenWithLens(lens, threadTiming));
                 }