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 d4728a4..faba46e 100644
--- a/src/main/java/com/android/tools/r8/graph/AppView.java
+++ b/src/main/java/com/android/tools/r8/graph/AppView.java
@@ -568,10 +568,10 @@
   }
 
   public void pruneItems(PrunedItems prunedItems) {
-    pruneItems(withLiveness(), prunedItems);
+    pruneItems(prunedItems, withLiveness());
   }
 
-  private static void pruneItems(AppView<AppInfoWithLiveness> appView, PrunedItems prunedItems) {
+  private static void pruneItems(PrunedItems prunedItems, AppView<AppInfoWithLiveness> appView) {
     if (!prunedItems.hasRemovedClasses() && !appView.options().configurationDebugging) {
       assert appView.appInfo().app() == prunedItems.getPrunedApp();
       return;
