move jdk.compiler.graal.truffle.compiler.* to jdk.compiler.graal.truffle.*

Author: dougxc

compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java

@@ -203,7 +203,7 @@ protected void updateVerifiers(List<VerifyPhase<CoreProviders>> verifiers) {
          */
         public boolean shouldCheckUsage(OptionDescriptor option) {
             Class<?> declaringClass = option.getDeclaringClass();
-            if (declaringClass.getName().equals("jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions")) {
+            if (declaringClass.getName().equals("jdk.compiler.graal.truffle.TruffleCompilerOptions")) {
                 /*
                  * These options are deprecated and will be removed in GraalVM 20.2.0. The
                  * TruffleIntrinsifyFrameAccess option has no replacement and is unused.

compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java

@@ -56,7 +56,7 @@
 public class OptionsVerifierTest {
 
     private static Set<String> ALLOWLIST = new TreeSet<>(Arrays.asList(//
-                    "jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions"));
+                    "jdk.compiler.graal.truffle.TruffleCompilerOptions"));
 
     @Test
     public void verifyOptions() throws IOException {

compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java

@@ -50,9 +50,9 @@
 import jdk.compiler.graal.replacements.ReplacementsImpl;
 import jdk.compiler.graal.replacements.SnippetTemplate;
 import jdk.compiler.graal.test.GraalTest.MethodSource;
-import jdk.compiler.graal.truffle.compiler.PerformanceInformationHandler;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.compiler.phases.inlining.CallTree;
+import jdk.compiler.graal.truffle.PerformanceInformationHandler;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.phases.inlining.CallTree;
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.PrimitiveConstant;

compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java

@@ -26,11 +26,11 @@
 
 import jdk.compiler.graal.core.common.CompilationIdentifier;
 import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
-import jdk.compiler.graal.truffle.compiler.PostPartialEvaluationSuite;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
-import jdk.compiler.graal.truffle.compiler.phases.inlining.AgnosticInliningPhase;
+import jdk.compiler.graal.truffle.PartialEvaluator;
+import jdk.compiler.graal.truffle.PostPartialEvaluationSuite;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.compiler.graal.truffle.phases.inlining.AgnosticInliningPhase;
 import org.graalvm.polyglot.Context;
 import org.junit.Before;
 

compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java

@@ -29,7 +29,7 @@
 
 import jdk.compiler.graal.core.test.GraalCompilerTest;
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins;
+import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;

compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java

@@ -33,7 +33,7 @@
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
 import jdk.compiler.graal.options.OptionValues;
 import jdk.compiler.graal.replacements.nodes.ArrayRegionEqualsNode;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins;
+import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins;
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;

compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java

@@ -28,7 +28,7 @@
 
 import jdk.compiler.graal.core.test.GraalCompilerTest;
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins;
+import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;

compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java

@@ -28,7 +28,7 @@
 
 import jdk.compiler.graal.core.test.GraalCompilerTest;
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins;
+import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;

compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java

@@ -26,8 +26,8 @@
 
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
 import jdk.compiler.graal.serviceprovider.GraalServices;
-import jdk.compiler.graal.truffle.compiler.substitutions.GraphBuilderInvocationPluginProvider;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleGraphBuilderPlugins;
+import jdk.compiler.graal.truffle.substitutions.GraphBuilderInvocationPluginProvider;
+import jdk.compiler.graal.truffle.substitutions.TruffleGraphBuilderPlugins;
 import org.junit.Test;
 
 import com.oracle.truffle.api.CompilerDirectives;

compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java

@@ -36,7 +36,7 @@
 import com.oracle.truffle.api.TruffleOptions;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
 import org.graalvm.polyglot.Context;
 import org.junit.Assert;
 import org.junit.Assume;