commit 85e7803e52e1725c624fbc2574587083b35aecc1
author Christoffer Adamsen <christofferqa@google.com> Thu Jul 04 13:26:53 2024 +0200
committer Christoffer Adamsen <christofferqa@google.com> Thu Jul 04 13:26:53 2024 +0200
tree 97b5b127c3ff880dc5eee0b7954b49a04fdc77c8
parent 306b966b00585f5503f1c31e4a9b425fe19c7cba

Account for missing classes in workaround for ART instance-of weakening

Bug: b/349857231
Bug: b/350689668
Change-Id: I85f86f63b402a77a118126e6151d8bba96f32f41

src/main/java/com/android/tools/r8/ir/optimize/RuntimeWorkaroundCodeRewriter.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/RuntimeWorkaroundCodeRewriter.java b/src/main/java/com/android/tools/r8/ir/optimize/RuntimeWorkaroundCodeRewriter.java
index 188c5ef..bcb57ce 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/RuntimeWorkaroundCodeRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/RuntimeWorkaroundCodeRewriter.java
@@ -109,7 +109,8 @@
               instanceOf.type().toTypeElement(appView, valueType.nullability());
           if (instanceOfType.isClassType(t -> t.getClassType().isNotIdenticalTo(objectType))
               && !instanceOfType.lessThanOrEqual(valueType, appView)
-              && !valueType.lessThanOrEqual(instanceOfType, appView)) {
+              && !valueType.lessThanOrEqual(instanceOfType, appView)
+              && !valueType.isBasedOnMissingClass(appView.withClassHierarchy())) {
             instructionIterator.replaceCurrentInstructionWithConstFalse(code);
             didReplaceInstructions = true;
           }