Move some classes to hosted project

* Labeler
* LowerableFile
* JSKeyword

None of them are actually needed at run time

Author: patrick96

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

@@ -34,10 +34,10 @@
 
 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 jdk.graal.compiler.hightiercodegen.CodeBuffer;
 import jdk.graal.compiler.nodes.ParameterNode;

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,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;

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

@@ -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 jdk.graal.compiler.hightiercodegen.CodeGenTool;
 
@@ -31,7 +31,7 @@
  *
  * 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.hosted.webimage/src/com/oracle/svm/hosted/webimage/codegen/JSCodeGenTool.java

@@ -40,11 +40,11 @@
 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 jdk.graal.compiler.core.common.NumUtil;

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

@@ -28,8 +28,8 @@
 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 jdk.graal.compiler.debug.GraalError;
 import jdk.graal.compiler.hightiercodegen.CodeBuffer;

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

@@ -29,8 +29,8 @@
 import java.util.Map;
 
 import com.oracle.svm.hosted.webimage.codegen.type.ClassMetadataLowerer;
+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.JSNameGenerator;
 
 import jdk.graal.compiler.hightiercodegen.CodeBuffer;

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

@@ -48,6 +48,7 @@
 import com.oracle.svm.hosted.meta.HostedUniverse;
 import com.oracle.svm.hosted.webimage.CodeSizeDiagnostics;
 import com.oracle.svm.hosted.webimage.JSCodeBuffer;
+import com.oracle.svm.hosted.webimage.Labeler;
 import com.oracle.svm.hosted.webimage.WebImageCodeCache;
 import com.oracle.svm.hosted.webimage.WebImageHostedConfiguration;
 import com.oracle.svm.hosted.webimage.codegen.compatibility.JSBenchmarkingCode;
@@ -61,7 +62,6 @@
 import com.oracle.svm.hosted.webimage.util.metrics.CodeSizeCollector;
 import com.oracle.svm.hosted.webimage.util.metrics.ImageMetricsCollector;
 import com.oracle.svm.hosted.webimage.util.metrics.MethodMetricsCollector;
-import com.oracle.svm.webimage.Labeler;
 import com.oracle.svm.webimage.NamingConvention;
 
 import jdk.graal.compiler.debug.DebugContext;

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

@@ -51,6 +51,7 @@
 import com.oracle.svm.hosted.meta.HostedMethod;
 import com.oracle.svm.hosted.meta.HostedType;
 import com.oracle.svm.hosted.webimage.JSCodeBuffer;
+import com.oracle.svm.hosted.webimage.Labeler;
 import com.oracle.svm.hosted.webimage.WebImageCodeCache;
 import com.oracle.svm.hosted.webimage.WebImageHostedConfiguration;
 import com.oracle.svm.hosted.webimage.codegen.compatibility.JSBenchmarkingCode;
@@ -71,7 +72,6 @@
 import com.oracle.svm.hosted.webimage.util.metrics.CodeSizeCollector;
 import com.oracle.svm.hosted.webimage.util.metrics.ImageMetricsCollector;
 import com.oracle.svm.util.ReflectionUtil;
-import com.oracle.svm.webimage.Labeler;
 
 import jdk.graal.compiler.debug.DebugContext;
 import jdk.graal.compiler.hightiercodegen.CodeBuffer;

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

@@ -73,8 +73,8 @@
 import com.oracle.svm.hosted.webimage.codegen.value.ResolvedVarLowerer;
 import com.oracle.svm.hosted.webimage.codegen.wrappers.JSEmitter;
 import com.oracle.svm.hosted.webimage.js.JSBody;
+import com.oracle.svm.hosted.webimage.js.JSKeyword;
 import com.oracle.svm.hosted.webimage.snippets.JSSnippets;
-import com.oracle.svm.webimage.JSKeyword;
 import com.oracle.svm.webimage.functionintrinsics.ImplicitExceptions;
 import com.oracle.svm.webimage.functionintrinsics.JSCallNode;
 import com.oracle.svm.webimage.functionintrinsics.JSFunctionDefinition;

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

@@ -29,8 +29,8 @@
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.meta.HostedMethod;
 import com.oracle.svm.hosted.meta.HostedType;
+import com.oracle.svm.hosted.webimage.Labeler;
 import com.oracle.svm.hosted.webimage.options.WebImageOptions;
-import com.oracle.svm.webimage.Labeler;
 
 import jdk.graal.compiler.debug.DebugContext;
 import jdk.graal.compiler.nodes.spi.CoreProviders;