Breaks some conformance around sun.misc.Unsafe usage.

PiperOrigin-RevId: 529476888
google · May 4, 2023 · e7513e6 · e7513e6
1 parent bb931fe
commit e7513e6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 53 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 name: continuous-integration
 env:
-  USE_BAZEL_VERSION: '6.1.2'
+  USE_BAZEL_VERSION: '4.2.2'
   USE_JAVA_DISTRIBUTION: 'zulu'
   USE_JAVA_VERSION: '11'
 

diff --git a/core/src/com/google/inject/internal/aop/AnonymousClassDefiner.java b/core/src/com/google/inject/internal/aop/AnonymousClassDefiner.java
@@ -16,6 +16,7 @@
 
 package com.google.inject.internal.aop;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
 /**
@@ -25,16 +26,17 @@
  */
 final class AnonymousClassDefiner implements ClassDefiner {
 
-  private static final sun.misc.Unsafe THE_UNSAFE;
+  private static final Object THE_UNSAFE;
   private static final Method ANONYMOUS_DEFINE_METHOD;
 
   static {
     try {
-      THE_UNSAFE = UnsafeGetter.getUnsafe();
-      // defineAnonymousClass was removed in JDK17, so we must refer to it reflectively.
+      Class<?> unsafeType = Class.forName("sun.misc.Unsafe");
+      Field theUnsafeField = unsafeType.getDeclaredField("theUnsafe");
+      theUnsafeField.setAccessible(true);
+      THE_UNSAFE = theUnsafeField.get(null);
       ANONYMOUS_DEFINE_METHOD =
-          sun.misc.Unsafe.class.getMethod(
-              "defineAnonymousClass", Class.class, byte[].class, Object[].class);
+          unsafeType.getMethod("defineAnonymousClass", Class.class, byte[].class, Object[].class);
     } catch (ReflectiveOperationException e) {
       throw new ExceptionInInitializerError(e);
     }

diff --git a/core/src/com/google/inject/internal/aop/HiddenClassDefiner.java b/core/src/com/google/inject/internal/aop/HiddenClassDefiner.java
@@ -28,18 +28,22 @@
  */
 final class HiddenClassDefiner implements ClassDefiner {
 
-  private static final sun.misc.Unsafe THE_UNSAFE;
-  private static final Object TRUSTED_LOOKUP_BASE;
-  private static final long TRUSTED_LOOKUP_OFFSET;
+  private static final Object THE_UNSAFE;
+  private static final Object TRUSTED_LOOKUP_OFFSET;
+  private static final Method GET_OBJECT_METHOD;
   private static final Object HIDDEN_CLASS_OPTIONS;
   private static final Method HIDDEN_DEFINE_METHOD;
 
   static {
     try {
-      THE_UNSAFE = UnsafeGetter.getUnsafe();
+      Class<?> unsafeType = Class.forName("sun.misc.Unsafe");
+      Field theUnsafeField = unsafeType.getDeclaredField("theUnsafe");
+      theUnsafeField.setAccessible(true);
+      THE_UNSAFE = theUnsafeField.get(null);
       Field trustedLookupField = Lookup.class.getDeclaredField("IMPL_LOOKUP");
-      TRUSTED_LOOKUP_BASE = THE_UNSAFE.staticFieldBase(trustedLookupField);
-      TRUSTED_LOOKUP_OFFSET = THE_UNSAFE.staticFieldOffset(trustedLookupField);
+      Method offsetMethod = unsafeType.getMethod("staticFieldOffset", Field.class);
+      TRUSTED_LOOKUP_OFFSET = offsetMethod.invoke(THE_UNSAFE, trustedLookupField);
+      GET_OBJECT_METHOD = unsafeType.getMethod("getObject", Object.class, long.class);
       HIDDEN_CLASS_OPTIONS = classOptions("NESTMATE");
       HIDDEN_DEFINE_METHOD =
           Lookup.class.getMethod(
@@ -52,7 +56,7 @@ final class HiddenClassDefiner implements ClassDefiner {
   @Override
   public Class<?> define(Class<?> hostClass, byte[] bytecode) throws Exception {
     Lookup trustedLookup =
-        (Lookup) THE_UNSAFE.getObject(TRUSTED_LOOKUP_BASE, TRUSTED_LOOKUP_OFFSET);
+        (Lookup) GET_OBJECT_METHOD.invoke(THE_UNSAFE, Lookup.class, TRUSTED_LOOKUP_OFFSET);
     Lookup definedLookup =
         (Lookup)
             HIDDEN_DEFINE_METHOD.invoke(

diff --git a/core/src/com/google/inject/internal/aop/UnsafeGetter.java b/core/src/com/google/inject/internal/aop/UnsafeGetter.java