commit e85845a475fb593ccd56845e824232478d8fda6d
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Apr 29 11:00:21 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Apr 29 11:00:21 2021 +0200
tree 03ceef1c37688d326df44bebbcb47994a75e4ae2
parent e8f35249bf9762bc4fcf62592fbb4f3b76b07f10

Fix rewrites to canUseJavaUtilObjectsIsNull()

Change-Id: Ie1f401a6b1cc93c1e23455511ebc4be1d76447b1

src/test/java/com/android/tools/r8/ir/optimize/inliner/SyntheticInlineNullCheckPositionTest.java

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/SyntheticInlineNullCheckPositionTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/SyntheticInlineNullCheckPositionTest.java
index b5588bd..7cdd9d0 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/SyntheticInlineNullCheckPositionTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/SyntheticInlineNullCheckPositionTest.java
@@ -71,7 +71,7 @@
         .assertFailureWithErrorThatThrows(NullPointerException.class)
         .inspectStackTrace(
             stackTrace -> {
-              if (canUseJavaUtilObjectsIsNull(parameters)) {
+              if (canUseJavaUtilObjectsRequireNonNull(parameters)) {
                 assertThat(
                     stackTrace,
                     isSameExceptForSpecificLineNumber(

src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/AssumeInstanceFieldValueTest.java

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/AssumeInstanceFieldValueTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/AssumeInstanceFieldValueTest.java
index 18618ca..4e275f4 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/AssumeInstanceFieldValueTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/AssumeInstanceFieldValueTest.java
@@ -70,7 +70,7 @@
 
     MethodSubject mainMethodSubject = testClassSubject.mainMethod();
     assertThat(mainMethodSubject, isPresent());
-    if (canUseJavaUtilObjectsIsNull(parameters)) {
+    if (canUseJavaUtilObjectsRequireNonNull(parameters)) {
       assertThat(mainMethodSubject, invokesMethodWithName("requireNonNull"));
     } else {
       assertThat(mainMethodSubject, invokesMethodWithName("getClass"));