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

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 2019, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2018, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 26,35 ****
--- 26,37 ----
  
  import static jdk.vm.ci.meta.DeoptimizationAction.None;
  import static jdk.vm.ci.meta.DeoptimizationReason.TransferToInterpreter;
  import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
  
+ import java.lang.reflect.Field;
+ 
  import org.graalvm.compiler.core.common.CompilationIdentifier;
  import org.graalvm.compiler.core.common.type.StampFactory;
  import org.graalvm.compiler.core.common.type.StampPair;
  import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
  import org.graalvm.compiler.hotspot.HotSpotCompilationIdentifier;
*** 64,75 ****
  import jdk.vm.ci.meta.JavaType;
  import jdk.vm.ci.meta.JavaTypeProfile;
  import jdk.vm.ci.meta.ResolvedJavaField;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  import jdk.vm.ci.meta.ResolvedJavaType;
- 
- import java.lang.reflect.Field;
  import sun.misc.Unsafe;
  
  /**
   * This plugin does HotSpot-specific customization of bytecode parsing:
   * <ul>
--- 66,75 ----
*** 241,254 ****
          }
          return afterExceptionLoaded;
      }
  
      private static final LocationIdentity JAVA_THREAD_SHOULD_POST_ON_EXCEPTIONS_FLAG_LOCATION = NamedLocationIdentity.mutable("JavaThread::_should_post_on_exceptions_flag");
  
!     private static final Unsafe UNSAFE = initUnsafe();
! 
!     private static Unsafe initUnsafe() {
          try {
              // Fast path when we are trusted.
              return Unsafe.getUnsafe();
          } catch (SecurityException se) {
              // Slow path when we are not trusted.
--- 241,253 ----
          }
          return afterExceptionLoaded;
      }
  
      private static final LocationIdentity JAVA_THREAD_SHOULD_POST_ON_EXCEPTIONS_FLAG_LOCATION = NamedLocationIdentity.mutable("JavaThread::_should_post_on_exceptions_flag");
+     static final Unsafe UNSAFE = initUnsafe();
  
!     static Unsafe initUnsafe() {
          try {
              // Fast path when we are trusted.
              return Unsafe.getUnsafe();
          } catch (SecurityException se) {
              // Slow path when we are not trusted.