commit 7628fc6152121739c6639f4e0fe297deaa86e53c
author Søren Gjesse <sgjesse@google.com> Thu Dec 01 17:55:16 2022 +0100
committer Søren Gjesse <sgjesse@google.com> Thu Dec 01 17:55:16 2022 +0100
tree b15ea69721289af08851eedddbf0bc63a27ad794
parent a49bbe7924e0de9b8227f8dccef38830914c20c1

Fix testVarHandleDesugaringGenerated

Bug: b/247076137
Change-Id: I7aa5c0ebc08892c0f7754640534a5188703e589a

src/test/java/com/android/tools/r8/ir/desugar/varhandle/GenerateVarHandleMethods.java

diff --git a/src/test/java/com/android/tools/r8/ir/desugar/varhandle/GenerateVarHandleMethods.java b/src/test/java/com/android/tools/r8/ir/desugar/varhandle/GenerateVarHandleMethods.java
index e691744..b15131b 100644
--- a/src/test/java/com/android/tools/r8/ir/desugar/varhandle/GenerateVarHandleMethods.java
+++ b/src/test/java/com/android/tools/r8/ir/desugar/varhandle/GenerateVarHandleMethods.java
@@ -140,6 +140,7 @@
           .setField(
               factory.createField(
                   field.getHolderType(), factory.createType("Lsun/misc/Unsafe;"), field.getName()))
+          .disableAndroidApiLevelCheck()
           .build();
     }
     return field;
@@ -186,7 +187,8 @@
     for (String prefix : ImmutableList.of("get", "set", "compareAndSet")) {
       if (method.getName().startsWith(prefix)) {
         assert method.getName().toString().substring(prefix.length()).equals("Int")
-            || method.getName().toString().substring(prefix.length()).equals("Long");
+            || method.getName().toString().substring(prefix.length()).equals("Long")
+            || method.getName().toString().equals(prefix);
         return methodWithName(method, prefix);
       }
     }