Limit the workaround for Art bug to Android P and before
The issue was fixed in Q.
Bug: 121232487, 120985556
Change-Id: I3594ba5d3de702ca766b57d5c3d5969d510dc6e9
diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index 7ea8602..e595762 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -904,10 +904,10 @@
// This happens rarely, but it can happen in debug mode where the move
// put a value into a new register which has associated locals information.
//
- // See b/120985556.
+ // Fixed in Android Q, see b/120985556.
public boolean canHaveArtInstanceOfVerifierBug() {
- // TODO(ager): Update this with an actual bound when the issue has been fixed.
- return true;
+ assert isGeneratingDex();
+ return minApiLevel < AndroidApiLevel.Q.getLevel();
}
// Some Art Lollipop version do not deal correctly with long-to-int conversions.
