src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalJVMCIServiceLocator.java

*** 24,33 ****
--- 24,34 ----
  
  package org.graalvm.compiler.hotspot;
  
  import org.graalvm.compiler.serviceprovider.ServiceProvider;
  
+ import jdk.vm.ci.common.NativeImageReinitialize;
  import jdk.vm.ci.hotspot.HotSpotVMEventListener;
  import jdk.vm.ci.runtime.JVMCICompilerFactory;
  import jdk.vm.ci.services.JVMCIServiceLocator;
  
  @ServiceProvider(JVMCIServiceLocator.class)
*** 49,59 ****
                  }
              }
              return null;
          }
  
!         private HotSpotGraalRuntime graalRuntime;
  
          /**
           * Notifies this object of the compiler created via {@link HotSpotGraalJVMCIServiceLocator}.
           */
          void onCompilerCreation(HotSpotGraalCompiler compiler) {
--- 50,60 ----
                  }
              }
              return null;
          }
  
!         @NativeImageReinitialize private HotSpotGraalRuntime graalRuntime;
  
          /**
           * Notifies this object of the compiler created via {@link HotSpotGraalJVMCIServiceLocator}.
           */
          void onCompilerCreation(HotSpotGraalCompiler compiler) {