src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringCompareToTest.java

*** 22,46 ****
   */
  
  
  package org.graalvm.compiler.replacements.test;
  
! import jdk.vm.ci.aarch64.AArch64;
! import jdk.vm.ci.amd64.AMD64;
! import jdk.vm.ci.meta.ResolvedJavaMethod;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.replacements.nodes.ArrayCompareToNode;
  import org.graalvm.compiler.serviceprovider.GraalServices;
  import org.junit.Assert;
  import org.junit.Assume;
  import org.junit.Test;
  
! import java.util.List;
! 
! import static org.graalvm.compiler.core.common.GraalOptions.RemoveNeverExecutedCode;
  
  /**
   * Tests compareTo method intrinsic.
   */
  public class StringCompareToTest extends StringSubstitutionTestBase {
--- 22,48 ----
   */
  
  
  package org.graalvm.compiler.replacements.test;
  
! import static org.graalvm.compiler.core.common.GraalOptions.RemoveNeverExecutedCode;
! 
! import java.util.List;
! 
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.replacements.nodes.ArrayCompareToNode;
  import org.graalvm.compiler.serviceprovider.GraalServices;
+ import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
  import org.junit.Assert;
  import org.junit.Assume;
  import org.junit.Test;
  
! import jdk.vm.ci.aarch64.AArch64;
! import jdk.vm.ci.amd64.AMD64;
! import jdk.vm.ci.meta.ResolvedJavaMethod;
  
  /**
   * Tests compareTo method intrinsic.
   */
  public class StringCompareToTest extends StringSubstitutionTestBase {
*** 87,97 ****
          }
  
          OptionValues options;
          boolean needCheckNode = true;
  
!         if (GraalServices.Java8OrEarlier) {
              needCheckNode = false;
          } else {
              List<String> vmArgs = GraalServices.getInputArguments();
              Assume.assumeTrue(vmArgs != null);
              for (String vmArg : vmArgs) {
--- 89,99 ----
          }
  
          OptionValues options;
          boolean needCheckNode = true;
  
!         if (JavaVersionUtil.Java8OrEarlier) {
              needCheckNode = false;
          } else {
              List<String> vmArgs = GraalServices.getInputArguments();
              Assume.assumeTrue(vmArgs != null);
              for (String vmArg : vmArgs) {