test/compiler/testlibrary/rtm/XAbortProvoker.java

*** 1,7 ****
  /*
!  * Copyright (c) 2014, 2015, 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) 2014, 2016, 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.
*** 23,43 ****
   */
  
  package compiler.testlibrary.rtm;
  
  import jdk.internal.misc.Unsafe;
- import jdk.test.lib.unsafe.UnsafeHelper;
  
  /**
   * Current RTM locking implementation force transaction abort
   * before native method call by explicit xabort(0) call.
   */
  class XAbortProvoker extends AbortProvoker {
      // Following field have to be static in order to avoid escape analysis.
      @SuppressWarnings("UnsuedDeclaration")
      private static int field = 0;
!     private static final Unsafe UNSAFE = UnsafeHelper.getUnsafe();
  
      public XAbortProvoker() {
          this(new Object());
      }
  
--- 23,42 ----
   */
  
  package compiler.testlibrary.rtm;
  
  import jdk.internal.misc.Unsafe;
  
  /**
   * Current RTM locking implementation force transaction abort
   * before native method call by explicit xabort(0) call.
   */
  class XAbortProvoker extends AbortProvoker {
      // Following field have to be static in order to avoid escape analysis.
      @SuppressWarnings("UnsuedDeclaration")
      private static int field = 0;
!     private static final Unsafe UNSAFE = Unsafe.getUnsafe();
  
      public XAbortProvoker() {
          this(new Object());
      }