commit 1205e32e326ce93024b61f3bcca32dcea9630204
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Dec 12 11:05:08 2019 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Dec 12 11:05:08 2019 +0100
tree e0694328ae89e7c9806c8e12d79f7aee38df7a0f
parent cb04319adf4ea0d29e2a0abe78f3d83dc5447ca2

Update test expectation for NonNullParamTest

Change-Id: Ia1a57aa0074b3c176fc4589f629f8713eaea9c1f

src/test/java/com/android/tools/r8/ir/optimize/NonNullParamTest.java

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/NonNullParamTest.java b/src/test/java/com/android/tools/r8/ir/optimize/NonNullParamTest.java
index 6b1d25b..cf379b3 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/NonNullParamTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/NonNullParamTest.java
@@ -24,6 +24,7 @@
 import com.android.tools.r8.ir.optimize.nonnull.NonNullParamInterface;
 import com.android.tools.r8.ir.optimize.nonnull.NonNullParamInterfaceImpl;
 import com.android.tools.r8.ir.optimize.nonnull.NotPinnedClass;
+import com.android.tools.r8.utils.AndroidApiLevel;
 import com.android.tools.r8.utils.InternalOptions;
 import com.android.tools.r8.utils.codeinspector.ClassSubject;
 import com.android.tools.r8.utils.codeinspector.CodeInspector;
@@ -192,7 +193,12 @@
     MethodSubject checkViaCall = mainSubject.uniqueMethodWithName("checkViaCall");
     assertThat(checkViaCall, isPresent());
     assertEquals(0, countActCall(checkViaCall));
-    assertEquals(2, countPrintCall(checkViaCall));
+    // With API level >= Q we get a register assignment that allows us to share the print call in a
+    // successor block. See also InternalOptions.canHaveThisJitCodeDebuggingBug().
+    boolean canSharePrintCallInSuccessorBlock =
+        parameters.isDexRuntime()
+            && parameters.getApiLevel().getLevel() >= AndroidApiLevel.Q.getLevel();
+    assertEquals(canSharePrintCallInSuccessorBlock ? 1 : 2, countPrintCall(checkViaCall));
 
     MethodSubject checkViaIntrinsic = mainSubject.uniqueMethodWithName("checkViaIntrinsic");
     assertThat(checkViaIntrinsic, isPresent());