[GR-41267] Fix memory corruption from wrong ForkJoinPool.poolIds offset.

PullRequest: graal/12733

Author: peter-hofer

compiler/src/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnsafeBooleanAccessTest.java

@@ -42,7 +42,7 @@ public class UnsafeBooleanAccessTest extends GraalCompilerTest {
     static {
         try {
             Field staticField = UnsafeBooleanAccessTest.class.getDeclaredField("onHeapMemory");
-            onHeapMemoryBase = getStaticFieldOffset(staticField);
+            onHeapMemoryBase = getStaticFieldBase(staticField);
             onHeapMemoryOffset = getStaticFieldOffset(staticField);
         } catch (Exception e) {
             throw new RuntimeException(e);

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RecomputedFields.java

@@ -27,6 +27,7 @@
 //Checkstyle: stop
 
 import static com.oracle.svm.core.annotate.RecomputeFieldValue.Kind.AtomicFieldUpdaterOffset;
+import static com.oracle.svm.core.annotate.RecomputeFieldValue.Kind.FieldOffset;
 import static com.oracle.svm.core.annotate.RecomputeFieldValue.Kind.Reset;
 
 import java.lang.ref.ReferenceQueue;
@@ -337,6 +338,7 @@ public static int getCommonPoolParallelism() {
     private static Unsafe U;
 
     @Alias @TargetElement(onlyWith = JDK19OrLater.class) //
+    @RecomputeFieldValue(kind = FieldOffset, name = "poolIds") //
     private static long POOLIDS;
 
     @Substitute
@@ -425,14 +427,6 @@ final class Target_java_util_concurrent_ForkJoinTask_JDK11OrEarlier {
 final class Target_java_util_concurrent_ForkJoinTask_ExceptionNode {
 }
 
-@TargetClass(value = java.util.concurrent.ForkJoinTask.class, onlyWith = JDK19OrLater.class)
-final class Target_java_util_concurrent_ForkJoinTask_JDK19OrLater {
-    @Alias @RecomputeFieldValue(kind = Kind.FieldOffset, name = "status") //
-    static long STATUS;
-    @Alias @RecomputeFieldValue(kind = Kind.FieldOffset, name = "aux") //
-    static long AUX;
-}
-
 /** Dummy class to have a class with the file's name. */
 public final class RecomputedFields {
 }