commit 3a00e56e7963d741a5a22c22f07496cdc48c000d
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Jun 18 11:23:46 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Fri Jun 18 09:25:14 2021 +0000
tree 5a478a04211bf2baebc8d1d41fc2e233d4dbf7e0
parent b9620515d9f52b25df2168ced4b955afa8d6faa4

Fix class inliner attempt to get block from detached instruction

Change-Id: I5a318f0bc2bcfd8e31a786c4cfa76dea5792b5e3

src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java b/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java
index 5f6ad1a..e653838 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java
@@ -742,8 +742,12 @@
     Set<BasicBlock> seen = Sets.newIdentityHashSet();
     Set<Instruction> users = eligibleInstance.uniqueUsers();
     for (Instruction user : users) {
+      if (!user.hasBlock()) {
+        continue;
+      }
+
       BasicBlock block = user.getBlock();
-      if (block == null || !seen.add(block)) {
+      if (!seen.add(block)) {
         continue;
       }