IRConverter: use the application already passed implicitly to constructor.
Change-Id: Iccda09c62d76b60d736b361890c91abdc93593a3
diff --git a/src/main/java/com/android/tools/r8/R8.java b/src/main/java/com/android/tools/r8/R8.java
index e3caf03..af3ab41 100644
--- a/src/main/java/com/android/tools/r8/R8.java
+++ b/src/main/java/com/android/tools/r8/R8.java
@@ -524,7 +524,7 @@
CfgPrinter printer = options.printCfg ? new CfgPrinter() : null;
try {
IRConverter converter = new IRConverter(appView, timing, printer, mainDexClasses);
- application = converter.optimize(application, executorService);
+ application = converter.optimize(executorService);
desugaredCallSites = converter.getDesugaredCallSites();
} finally {
timing.end();
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
index 0ec8d2f..e1863b2 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
@@ -485,18 +485,16 @@
}
}
- public DexApplication optimize(DexApplication application) throws ExecutionException {
+ public DexApplication optimize() throws ExecutionException {
ExecutorService executor = Executors.newSingleThreadExecutor();
try {
- return optimize(application, executor);
+ return optimize(executor);
} finally {
executor.shutdown();
}
}
- public DexApplication optimize(DexApplication application, ExecutorService executorService)
- throws ExecutionException {
- AppView<AppInfoWithLiveness> appViewWithLiveness = appView.withLiveness();
+ public DexApplication optimize(ExecutorService executorService) throws ExecutionException {
if (options.isShrinking()) {
assert !removeLambdaDeserializationMethods();
@@ -504,6 +502,8 @@
removeLambdaDeserializationMethods();
}
+ DexApplication application = appView.appInfo().app();
+
computeReachabilitySensitivity(application);
collectLambdaMergingCandidates(application);
collectStaticizerCandidates(application);
diff --git a/src/test/java/com/android/tools/r8/R8UnreachableCodeTest.java b/src/test/java/com/android/tools/r8/R8UnreachableCodeTest.java
index ff3d385..388f8ba 100644
--- a/src/test/java/com/android/tools/r8/R8UnreachableCodeTest.java
+++ b/src/test/java/com/android/tools/r8/R8UnreachableCodeTest.java
@@ -45,7 +45,7 @@
new ApplicationReader(input, options, timing).read(executorService).toDirect();
IRConverter converter =
new IRConverter(AppView.createForR8(new AppInfoWithSubtyping(application), options));
- converter.optimize(application);
+ converter.optimize();
DexProgramClass clazz = application.classes().iterator().next();
assertEquals(4, clazz.directMethods().size());
for (DexEncodedMethod method : clazz.directMethods()) {
