commit 563b7722e1db855cc83c75d26621369694a167b4
author Christoffer Adamsen <christofferqa@google.com> Wed Sep 18 08:08:48 2024 +0200
committer Christoffer Adamsen <christofferqa@google.com> Wed Sep 18 08:08:48 2024 +0200
tree d0ce359979a3f5a3c1cd4e252cb748538279bb77
parent e5bd7dd0abc10c053b0fffbdd853e278af9243f7

Fix NPE in IfRuleEvaluatorFactory

Change-Id: If90aa15234bb1d49fc2cf7ff3fe7da71819f5469

src/main/java/com/android/tools/r8/shaking/IfRuleEvaluatorFactory.java

diff --git a/src/main/java/com/android/tools/r8/shaking/IfRuleEvaluatorFactory.java b/src/main/java/com/android/tools/r8/shaking/IfRuleEvaluatorFactory.java
index dc438f3..1f316e2 100644
--- a/src/main/java/com/android/tools/r8/shaking/IfRuleEvaluatorFactory.java
+++ b/src/main/java/com/android/tools/r8/shaking/IfRuleEvaluatorFactory.java
@@ -53,7 +53,8 @@
       AppView<? extends AppInfoWithClassHierarchy> appView,
       Enqueuer enqueuer,
       ExecutorService executorService) {
-    Set<ProguardIfRule> ifRules = appView.rootSet().ifRules;
+    Set<ProguardIfRule> ifRules =
+        appView.hasRootSet() ? appView.rootSet().ifRules : Collections.emptySet();
     if (ifRules != null && !ifRules.isEmpty()) {
       enqueuer.registerAnalysis(new IfRuleEvaluatorFactory(appView, enqueuer, executorService));
     }