*** old/test/compiler/c2/6589834/Test_ia32.java	Tue Dec  9 15:12:59 2014
--- new/test/compiler/c2/6589834/Test_ia32.java	Tue Dec  9 15:12:59 2014

*** 24,49 ****
--- 24,49 ----
  /**
   * @test
   * @bug 6589834
   * @summary Safepoint placed between stack pointer increment and decrement leads
   *          to interpreter's stack corruption after deoptimization.
!  * @library /testlibrary /testlibrary/whitebox
!  * @build ClassFileInstaller sun.hotspot.WhiteBox com.oracle.java.testlibrary.*
!  * @library /testlibrary /../../test/lib
!  * @build ClassFileInstaller jdk.testlib.WhiteBox com.oracle.java.testlibrary.*
   *        Test_ia32 InlinedArrayCloneTestCase
!  * @run main ClassFileInstaller sun.hotspot.WhiteBox
!  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
!  * @run main ClassFileInstaller jdk.testlib.WhiteBox
!  *                              jdk.testlib.WhiteBox$WhiteBoxPermission
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
   *      -XX:+WhiteBoxAPI -XX:CompileOnly=InlinedArrayCloneTestCase
   *      -XX:CompileCommand=dontinline,InlinedArrayCloneTestCase.invokeArrayClone
   *      -XX:CompileCommand=inline,InlinedArrayCloneTestCase.verifyArguments
   *      -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyStack Test_ia32
   */
  
  import java.lang.reflect.Method;
  
  import com.oracle.java.testlibrary.Asserts;
! import sun.hotspot.WhiteBox;
! import jdk.testlib.WhiteBox;
  
  public class Test_ia32 {
      private static final int NUM_THREADS
              = Math.min(100, 2 * Runtime.getRuntime().availableProcessors());
      private static final int CLONE_LENGTH = 1000;