[GR-66412] Move hightiercodegen to Web Image suite

PullRequest: graal/21216

Author: patrick96

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/irwalk/BasicBlockInterpreter.java

@@ -41,8 +41,9 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import jdk.graal.compiler.hightiercodegen.lowerer.MoveResolver;
-import jdk.graal.compiler.hightiercodegen.lowerer.MoveResolver.Schedule;
+import com.oracle.svm.hosted.webimage.codegen.lowerer.MoveResolver;
+import com.oracle.svm.hosted.webimage.codegen.lowerer.MoveResolver.Schedule;
+
 import jdk.graal.compiler.test.AddExports;
 
 /**

web-image/src/com.oracle.svm.hosted.webimage.test/src/com/oracle/svm/hosted/webimage/test/unit/MoveResolverTest.java

@@ -34,12 +34,12 @@
 
 import com.oracle.svm.hosted.webimage.codegen.WebImageJSNodeLowerer;
 import com.oracle.svm.hosted.webimage.codegen.WebImageProviders;
+import com.oracle.svm.hosted.webimage.js.JSKeyword;
 import com.oracle.svm.hosted.webimage.logging.LoggerContext;
 import com.oracle.svm.hosted.webimage.options.WebImageOptions;
 import com.oracle.svm.util.LogUtils;
-import com.oracle.svm.webimage.JSKeyword;
+import com.oracle.svm.webimage.hightiercodegen.CodeBuffer;
 
-import jdk.graal.compiler.hightiercodegen.CodeBuffer;
 import jdk.graal.compiler.nodes.ParameterNode;
 import jdk.graal.compiler.options.OptionValues;
 import jdk.vm.ci.common.JVMCIError;

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/JSCodeBuffer.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.webimage;
+package com.oracle.svm.hosted.webimage;
 
 import java.util.ArrayList;
 import java.util.function.BiConsumer;
@@ -33,9 +33,9 @@
 import org.graalvm.collections.EconomicMap;
 
 import com.oracle.svm.hosted.meta.HostedMethod;
+import com.oracle.svm.webimage.hightiercodegen.CodeBuffer;
 
 import jdk.graal.compiler.debug.MetricKey;
-import jdk.graal.compiler.hightiercodegen.CodeBuffer;
 
 /**
  * A utility class used for injecting label pairs and method labels inside JavaScript image. Besides

web-image/src/com.oracle.svm.webimage/src/com/oracle/svm/webimage/Labeler.java renamed to web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/Labeler.java

@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.webimage;
+package com.oracle.svm.hosted.webimage;
 
-import jdk.graal.compiler.hightiercodegen.CodeGenTool;
+import com.oracle.svm.webimage.hightiercodegen.CodeGenTool;
 
 /**
  * Represents a JS file that needs to be linked and lowered.
  *
  * A LowerableFile might contain references to Java class and method names, which need to be
  * resolved to the actual JS names that are generated for the Java classes and methods (See
- * {@code JSIntrinsifyFile}). This is the <i>linking</> process.
+ * {@code JSIntrinsifyFile}). This is the <i>linking</i> process.
  *
  * A LowerableFile might have JavaScript evaluation order dependencies among them and/or on lowered
  * Java classes. The high-level lowering logic handles the dependencies when output the contents of

web-image/src/com.oracle.svm.webimage/src/com/oracle/svm/webimage/LowerableFile.java renamed to web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/LowerableFile.java

@@ -29,9 +29,9 @@
 import com.oracle.svm.hosted.webimage.codegen.type.TypeVtableLowerer;
 import com.oracle.svm.webimage.functionintrinsics.JSFunctionDefinition;
 import com.oracle.svm.webimage.functionintrinsics.JSGenericFunctionDefinition;
+import com.oracle.svm.webimage.hightiercodegen.Emitter;
+import com.oracle.svm.webimage.hightiercodegen.IEmitter;
 
-import jdk.graal.compiler.hightiercodegen.Emitter;
-import jdk.graal.compiler.hightiercodegen.IEmitter;
 import jdk.graal.compiler.nodes.ValueNode;
 import jdk.vm.ci.meta.JavaKind;
 

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/codegen/Array.java

@@ -40,20 +40,20 @@
 import com.oracle.svm.core.option.HostedOptionValues;
 import com.oracle.svm.hosted.meta.HostedType;
 import com.oracle.svm.hosted.webimage.JSCodeBuffer;
+import com.oracle.svm.hosted.webimage.LowerableFile;
 import com.oracle.svm.hosted.webimage.WebImageHostedConfiguration;
 import com.oracle.svm.hosted.webimage.js.JSBody;
+import com.oracle.svm.hosted.webimage.js.JSKeyword;
 import com.oracle.svm.hosted.webimage.options.WebImageOptions;
-import com.oracle.svm.webimage.JSKeyword;
-import com.oracle.svm.webimage.LowerableFile;
 import com.oracle.svm.webimage.annotation.WebImage;
+import com.oracle.svm.webimage.hightiercodegen.CodeGenTool;
+import com.oracle.svm.webimage.hightiercodegen.Emitter;
+import com.oracle.svm.webimage.hightiercodegen.IEmitter;
+import com.oracle.svm.webimage.hightiercodegen.Keyword;
+import com.oracle.svm.webimage.hightiercodegen.variables.ResolvedVar;
+import com.oracle.svm.webimage.hightiercodegen.variables.VariableAllocation;
 
 import jdk.graal.compiler.core.common.NumUtil;
-import jdk.graal.compiler.hightiercodegen.CodeGenTool;
-import jdk.graal.compiler.hightiercodegen.Emitter;
-import jdk.graal.compiler.hightiercodegen.IEmitter;
-import jdk.graal.compiler.hightiercodegen.Keyword;
-import jdk.graal.compiler.hightiercodegen.variables.ResolvedVar;
-import jdk.graal.compiler.hightiercodegen.variables.VariableAllocation;
 import jdk.graal.compiler.nodes.ParameterNode;
 import jdk.graal.compiler.nodes.StructuredGraph;
 import jdk.graal.compiler.nodes.ValueNode;

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/codegen/JSCodeGenTool.java

@@ -25,8 +25,7 @@
 package com.oracle.svm.hosted.webimage.codegen;
 
 import com.oracle.svm.hosted.webimage.codegen.heap.ConstantMap;
-
-import jdk.graal.compiler.hightiercodegen.CodeBuffer;
+import com.oracle.svm.webimage.hightiercodegen.CodeBuffer;
 
 class KnownHubMapLowerer {
 

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/codegen/KnownHubMapLowerer.java

@@ -28,12 +28,12 @@
 import java.io.InputStream;
 import java.util.Scanner;
 
+import com.oracle.svm.hosted.webimage.LowerableFile;
 import com.oracle.svm.hosted.webimage.codegen.JSIntrinsifyFile.FileData;
-import com.oracle.svm.webimage.LowerableFile;
+import com.oracle.svm.webimage.hightiercodegen.CodeBuffer;
+import com.oracle.svm.webimage.hightiercodegen.CodeGenTool;
 
 import jdk.graal.compiler.debug.GraalError;
-import jdk.graal.compiler.hightiercodegen.CodeBuffer;
-import jdk.graal.compiler.hightiercodegen.CodeGenTool;
 
 /**
  * Represents a hand-written JavaScript file that is part of Web Image. The content is accessed as a

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/codegen/LowerableResource.java

@@ -25,8 +25,7 @@
 package com.oracle.svm.hosted.webimage.codegen;
 
 import com.oracle.svm.webimage.functionintrinsics.JSGenericFunctionDefinition;
-
-import jdk.graal.compiler.hightiercodegen.CodeBuffer;
+import com.oracle.svm.webimage.hightiercodegen.CodeBuffer;
 
 /**
  * Wraps the Web Image namespace into its own scope so that definitions don't leak out.