8346825: [JVMCI] Remove NativeImageReinitialize annotation

Reviewed-by: never

Author: Doug Simon

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/common/InitTimer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,7 +82,7 @@ private static boolean isEnabled() {
     /**
      * Cache for value of {@code jvmci.InitTimer} system property.
      */
-    @NativeImageReinitialize private static Boolean enabledPropertyValue;
+    private static Boolean enabledPropertyValue;
 
     private static AtomicInteger nesting;
     private static final String SPACES = "                                            ";

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/common/NativeImageReinitialize.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
 
-import jdk.vm.ci.common.NativeImageReinitialize;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 /**
@@ -41,7 +40,7 @@ public abstract class Cleaner extends WeakReference<Object> {
     /**
      * Head of linked list of cleaners.
      */
-    @NativeImageReinitialize private static Cleaner first;
+    private static Cleaner first;
 
     /**
      * Linked list pointers.

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/Cleaner.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 import java.util.stream.Collectors;
 
 import jdk.vm.ci.common.JVMCIError;
-import jdk.vm.ci.common.NativeImageReinitialize;
 import static jdk.vm.ci.hotspot.CompilerToVM.compilerToVM;
 import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
 import static jdk.vm.ci.hotspot.HotSpotVMConfig.config;
@@ -182,7 +181,7 @@ JvmConstant get(int tag) {
             throw new JVMCIError("Unknown JvmConstant tag %s", tag);
         }
 
-        @NativeImageReinitialize private static volatile JvmConstants instance;
+        private static volatile JvmConstants instance;
 
         static JvmConstants instance() {
             JvmConstants result = instance;

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstantPool.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 import java.util.Set;
 
 import jdk.vm.ci.code.CompilationRequest;
-import jdk.vm.ci.common.NativeImageReinitialize;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.Option;
 import jdk.vm.ci.runtime.JVMCICompiler;
 import jdk.vm.ci.runtime.JVMCICompilerFactory;
@@ -78,7 +77,7 @@ public boolean isGCSupported(int gcIdentifier) {
     /**
      * Factory of the selected system compiler.
      */
-    @NativeImageReinitialize private static JVMCICompilerFactory compilerFactory;
+    private static JVMCICompilerFactory compilerFactory;
 
     /**
      * Gets the selected system compiler factory.

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,6 @@
 import jdk.vm.ci.code.InstalledCode;
 import jdk.vm.ci.common.InitTimer;
 import jdk.vm.ci.common.JVMCIError;
-import jdk.vm.ci.common.NativeImageReinitialize;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaField;
@@ -84,7 +83,7 @@ public final class HotSpotJVMCIRuntime implements JVMCIRuntime {
     /**
      * Singleton instance lazily initialized via double-checked locking.
      */
-    @NativeImageReinitialize private static volatile HotSpotJVMCIRuntime instance;
+    private static volatile HotSpotJVMCIRuntime instance;
 
     private HotSpotResolvedObjectTypeImpl javaLangObject;
     private HotSpotResolvedObjectTypeImpl javaLangInvokeMethodHandle;
@@ -287,7 +286,7 @@ public enum Option {
         private static final String NULL_VALUE = "NULL";
 
         private final Class<?> type;
-        @NativeImageReinitialize private Object value;
+        private Object value;
         private final Object defaultValue;
         boolean isDefault = true;
         private final String[] helpLines;
@@ -491,12 +490,12 @@ public static JavaKind getHostWordKind() {
     private volatile JVMCICompiler compiler;
     protected final HotSpotJVMCIReflection reflection;
 
-    @NativeImageReinitialize private volatile boolean creatingCompiler;
+    private volatile boolean creatingCompiler;
 
     /**
      * Cache for speeding up {@link #fromClass(Class)}.
      */
-    @NativeImageReinitialize private volatile ClassValue<WeakReferenceHolder<HotSpotResolvedJavaType>> resolvedJavaType;
+    private volatile ClassValue<WeakReferenceHolder<HotSpotResolvedJavaType>> resolvedJavaType;
 
     /**
      * To avoid calling ClassValue.remove to refresh the weak reference, which under certain
@@ -538,20 +537,20 @@ public KlassWeakReference(Long klassPointer, HotSpotResolvedObjectTypeImpl refer
      * A mapping from the {@code Klass*} to the corresponding {@link HotSpotResolvedObjectTypeImpl}.  The value is
      * held weakly through a {@link KlassWeakReference} so that unused types can be unloaded when the compiler no longer needs them.
      */
-    @NativeImageReinitialize private HashMap<Long, KlassWeakReference> resolvedJavaTypes;
+    private HashMap<Long, KlassWeakReference> resolvedJavaTypes;
 
     /**
      * A {@link ReferenceQueue} to track when {@link KlassWeakReference}s have been freed so that the corresponding
      * entry in {@link #resolvedJavaTypes} can be cleared.
      */
-    @NativeImageReinitialize private ReferenceQueue<HotSpotResolvedObjectTypeImpl> resolvedJavaTypesQueue;
+    private ReferenceQueue<HotSpotResolvedObjectTypeImpl> resolvedJavaTypesQueue;
 
     /**
      * Stores the value set by {@link #excludeFromJVMCICompilation(Module...)} so that it can be
      * read from the VM.
      */
     @SuppressWarnings("unused")//
-    @NativeImageReinitialize private Module[] excludeFromJVMCICompilation;
+    private Module[] excludeFromJVMCICompilation;
 
     private final Map<Class<? extends Architecture>, JVMCIBackend> backends = new HashMap<>();
 

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 
 import java.util.Arrays;
 
-import jdk.vm.ci.common.NativeImageReinitialize;
 import jdk.internal.misc.Unsafe;
 import jdk.vm.ci.meta.DeoptimizationReason;
 import jdk.vm.ci.meta.JavaMethodProfile;
@@ -144,7 +143,7 @@ private int cellsToBytes(int cells) {
         /**
          * Singleton instance lazily initialized via double-checked locking.
          */
-        @NativeImageReinitialize private static volatile VMState instance;
+        private static volatile VMState instance;
 
         static VMState instance() {
             VMState result = instance;

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodData.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 import java.lang.invoke.MethodHandle;
 
 import jdk.vm.ci.common.JVMCIError;
-import jdk.vm.ci.common.NativeImageReinitialize;
 import jdk.vm.ci.hotspot.HotSpotMethodData.VMState;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaConstant;
@@ -107,7 +106,7 @@ private Internals() {
         /**
          * Singleton instance lazily initialized via double-checked locking.
          */
-        @NativeImageReinitialize private static volatile Internals instance;
+        private static volatile Internals instance;
 
         static Internals instance() {
             Internals result = instance;

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 import java.util.List;
 
 import jdk.vm.ci.common.JVMCIError;
-import jdk.vm.ci.common.NativeImageReinitialize;
 import jdk.vm.ci.meta.AnnotationData;
 import jdk.vm.ci.meta.Assumptions.AssumptionResult;
 import jdk.vm.ci.meta.JavaConstant;
@@ -46,7 +45,7 @@
  */
 public final class HotSpotResolvedPrimitiveType extends HotSpotResolvedJavaType {
 
-    @NativeImageReinitialize static HotSpotResolvedPrimitiveType[] primitives;
+    static HotSpotResolvedPrimitiveType[] primitives;
 
     private JavaKind kind;
     HotSpotObjectConstantImpl mirror;

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,17 +24,16 @@
 
 import java.util.Formatter;
 
-import jdk.vm.ci.common.NativeImageReinitialize;
 import jdk.vm.ci.services.Services;
 
 public class JVMCI {
 
     /**
      * Singleton instance lazily initialized via double-checked locking.
      */
-    @NativeImageReinitialize private static volatile JVMCIRuntime runtime;
+    private static volatile JVMCIRuntime runtime;
 
-    @NativeImageReinitialize private static boolean initializing;
+    private static boolean initializing;
 
     public static void initialize() {
         // force static initializer