Update suppressions for usage of sun.misc.Unsafe.

- As best I can tell (cl/712957106, cl/714130759), the `removal` suppressions aren't accomplishing anything. RELNOTES=n/a PiperOrigin-RevId: 715941598
google · Jan 15, 2025 · 18131c0 · 18131c0
1 parent d6ceb21
commit 18131c0
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/android/guava/src/com/google/common/cache/Striped64.java b/android/guava/src/com/google/common/cache/Striped64.java
@@ -25,7 +25,7 @@
  * striping on 64bit values. The class extends Number so that concrete subclasses must publicly do
  * so.
  */
-@SuppressWarnings({"SunApi", "removal"}) // b/345822163
+@SuppressWarnings("SunApi") // b/345822163
 @GwtIncompatible
 abstract class Striped64 extends Number {
   /*

diff --git a/android/guava/src/com/google/common/hash/LittleEndianByteArray.java b/android/guava/src/com/google/common/hash/LittleEndianByteArray.java
@@ -135,7 +135,7 @@ private interface LittleEndianBytes {
    * Unsafe.theUnsafe is inaccessible, the attempt to load the nested class fails, and the outer
    * class's static initializer can fall back on a non-Unsafe version.
    */
-  @SuppressWarnings({"SunApi", "removal"}) // b/345822163
+  @SuppressWarnings("SunApi") // b/345822163
   @VisibleForTesting
   enum UnsafeByteArray implements LittleEndianBytes {
     // Do *not* change the order of these constants!

diff --git a/android/guava/src/com/google/common/hash/Striped64.java b/android/guava/src/com/google/common/hash/Striped64.java
@@ -26,7 +26,7 @@
  * so.
  */
 @GwtIncompatible
-@SuppressWarnings({"SunApi", "removal"}) // b/345822163
+@SuppressWarnings("SunApi") // b/345822163
 abstract class Striped64 extends Number {
   /*
    * This class maintains a lazily-initialized table of atomically

diff --git a/android/guava/src/com/google/common/primitives/UnsignedBytes.java b/android/guava/src/com/google/common/primitives/UnsignedBytes.java
@@ -292,7 +292,7 @@ static class LexicographicalComparatorHolder {
 
     static final Comparator<byte[]> BEST_COMPARATOR = getBestComparator();
 
-    @SuppressWarnings({"SunApi", "removal"}) // b/345822163
+    @SuppressWarnings("SunApi") // b/345822163
     @VisibleForTesting
     enum UnsafeComparator implements Comparator<byte[]> {
       INSTANCE;

diff --git a/android/guava/src/com/google/common/util/concurrent/AbstractFuture.java b/android/guava/src/com/google/common/util/concurrent/AbstractFuture.java
@@ -1336,7 +1336,7 @@ abstract boolean casListeners(
    * <p>Static initialization of this class will fail if the {@link sun.misc.Unsafe} object cannot
    * be accessed.
    */
-  @SuppressWarnings({"SunApi", "removal"}) // b/345822163
+  @SuppressWarnings("SunApi") // b/345822163
   private static final class UnsafeAtomicHelper extends AtomicHelper {
     static final Unsafe UNSAFE;
     static final long LISTENERS_OFFSET;

diff --git a/guava/src/com/google/common/hash/LittleEndianByteArray.java b/guava/src/com/google/common/hash/LittleEndianByteArray.java
@@ -170,7 +170,7 @@ public boolean usesFastPath() {
    * Unsafe.theUnsafe is inaccessible, the attempt to load the nested class fails, and the outer
    * class's static initializer can fall back on a non-Unsafe version.
    */
-  @SuppressWarnings({"SunApi", "removal"}) // b/345822163
+  @SuppressWarnings("SunApi") // b/345822163
   @VisibleForTesting
   enum UnsafeByteArray implements LittleEndianBytes {
     // Do *not* change the order of these constants!

diff --git a/guava/src/com/google/common/primitives/UnsignedBytes.java b/guava/src/com/google/common/primitives/UnsignedBytes.java
@@ -294,7 +294,7 @@ static class LexicographicalComparatorHolder {
 
     static final Comparator<byte[]> BEST_COMPARATOR = getBestComparator();
 
-    @SuppressWarnings({"SunApi", "removal"}) // b/345822163
+    @SuppressWarnings("SunApi") // b/345822163
     @VisibleForTesting
     enum UnsafeComparator implements Comparator<byte[]> {
       INSTANCE;

diff --git a/guava/src/com/google/common/util/concurrent/AbstractFuture.java b/guava/src/com/google/common/util/concurrent/AbstractFuture.java
@@ -1464,7 +1464,7 @@ private static LinkageError newLinkageError(Throwable cause) {
    * <p>Static initialization of this class will fail if the {@link sun.misc.Unsafe} object cannot
    * be accessed.
    */
-  @SuppressWarnings({"SunApi", "removal"}) // b/345822163
+  @SuppressWarnings("SunApi") // b/345822163
   private static final class UnsafeAtomicHelper extends AtomicHelper {
     static final Unsafe UNSAFE;
     static final long LISTENERS_OFFSET;