fix get static field by unsafe

apache · Feb 20, 2024 · ab44771 · ab44771
1 parent dbbd096
commit ab44771
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/...ry-core/src/main/java/org/apache/fury/serializer/scala/SingletonCollectionSerializer.java b/...ry-core/src/main/java/org/apache/fury/serializer/scala/SingletonCollectionSerializer.java
@@ -36,6 +36,7 @@
 @SuppressWarnings("rawtypes")
 public class SingletonCollectionSerializer extends AbstractCollectionSerializer {
   private final Field field;
+  private Object base = null;
   private long offset = -1;
 
   public SingletonCollectionSerializer(Fury fury, Class cls) {
@@ -61,8 +62,9 @@ public Object read(MemoryBuffer buffer) {
     if (offset == -1) {
       Preconditions.checkArgument(!GraalvmSupport.isGraalBuildtime());
       offset = this.offset = Platform.UNSAFE.staticFieldOffset(field);
+      base = Platform.UNSAFE.staticFieldBase(field);
     }
-    return Platform.getObject(type, offset);
+    return Platform.getObject(base, offset);
   }
 
   @Override

diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonMapSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonMapSerializer.java
@@ -36,6 +36,7 @@
 @SuppressWarnings("rawtypes")
 public class SingletonMapSerializer extends AbstractMapSerializer {
   private final Field field;
+  private Object base = null;
   private long offset = -1;
 
   public SingletonMapSerializer(Fury fury, Class cls) {
@@ -61,8 +62,9 @@ public Object read(MemoryBuffer buffer) {
     if (offset == -1) {
       Preconditions.checkArgument(!GraalvmSupport.isGraalBuildtime());
       offset = this.offset = Platform.UNSAFE.staticFieldOffset(field);
+      base = Platform.UNSAFE.staticFieldBase(field);
     }
-    return Platform.getObject(type, offset);
+    return Platform.getObject(base, offset);
   }
 
   @Override

diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonObjectSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonObjectSerializer.java
@@ -34,6 +34,7 @@
 @SuppressWarnings("rawtypes")
 public class SingletonObjectSerializer extends Serializer {
   private final Field field;
+  private Object base = null;
   private long offset = -1;
 
   public SingletonObjectSerializer(Fury fury, Class type) {
@@ -54,7 +55,8 @@ public Object read(MemoryBuffer buffer) {
     if (offset == -1) {
       Preconditions.checkArgument(!GraalvmSupport.isGraalBuildtime());
       offset = this.offset = Platform.UNSAFE.staticFieldOffset(field);
+      base = Platform.UNSAFE.staticFieldBase(field);
     }
-    return Platform.getObject(type, offset);
+    return Platform.getObject(base, offset);
   }
 }
diff --git a/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_Lookup.java b/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_Lookup.java
@@ -41,7 +41,8 @@ class _Lookup {
       try {
         Field implLookup = Lookup.class.getDeclaredField("IMPL_LOOKUP");
         long fieldOffset = _JDKAccess.UNSAFE.staticFieldOffset(implLookup);
-        trustedLookup = (Lookup) _JDKAccess.UNSAFE.getObject(Lookup.class, fieldOffset);
+        Object fieldBase = _JDKAccess.UNSAFE.staticFieldBase(implLookup);
+        trustedLookup = (Lookup) _JDKAccess.UNSAFE.getObject(fieldBase, fieldOffset);
       } catch (Throwable ignored) {
         // ignored
       }