WebImage: simplify disabling TruffleString SIMD intrinsics

Author: djoooooe

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/substitutions/TruffleInvocationPlugins.java

@@ -97,9 +97,15 @@
 public class TruffleInvocationPlugins {
 
     public static void register(Architecture architecture, InvocationPlugins plugins) {
+        register(architecture, plugins, true);
+    }
+
+    public static void register(Architecture architecture, InvocationPlugins plugins, boolean registerSIMDIntrinsics) {
         if (architecture instanceof AMD64 || architecture instanceof AArch64) {
-            registerTStringPlugins(plugins, architecture);
-            registerArrayUtilsPlugins(plugins);
+            if (registerSIMDIntrinsics) {
+                registerTStringPlugins(plugins, architecture);
+                registerArrayUtilsPlugins(plugins);
+            }
             registerExactMathPlugins(plugins);
         }
         registerFramePlugins(plugins);

substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java

@@ -497,7 +497,14 @@ public void cleanup() {
     @Override
     public void registerInvocationPlugins(Providers providers, Plugins plugins, ParsingReason reason) {
         StaticObjectSupport.registerInvocationPlugins(plugins, reason);
-        TruffleInvocationPlugins.register(providers.getLowerer().getTarget().arch, plugins.getInvocationPlugins());
+
+        /*
+         * SIMD intrinsics for TruffleString and ArrayUtils are implemented for AMD64 and AARCH64
+         * only, so they need to be turned off when compiling for WebImage.
+         */
+        Class<?> webImageFeature = ReflectionUtil.lookupClass(true, "com.oracle.svm.webimage.truffle.WebImageTruffleFeature");
+        boolean registerSIMDIntrinsics = webImageFeature == null || !ImageSingletons.contains(webImageFeature);
+        TruffleInvocationPlugins.register(providers.getLowerer().getTarget().arch, plugins.getInvocationPlugins(), registerSIMDIntrinsics);
 
         /*
          * We need to constant-fold Profile.isProfilingEnabled already during static analysis, so

truffle/src/com.oracle.truffle.api.strings/src/com/oracle/truffle/api/strings/TSCodeRange.java

@@ -75,7 +75,6 @@ final class TSCodeRange {
      */
     private static final int FLAG_IMPRECISE = 1 << 5;
     private static final int MASK_ORDINAL_MULTIBYTE = MASK_ORDINAL | FLAG_MULTIBYTE;
-    private static final int MASK_FOREIGN_ENDIAN_MULTIBYTE = FLAG_FOREIGN_ENDIAN | FLAG_MULTIBYTE;
 
     /**
      * All codepoints are ASCII (0x00 - 0x7f).
@@ -137,10 +136,6 @@ static boolean isForeignEndian(int codeRange) {
         return (codeRange & FLAG_FOREIGN_ENDIAN) != 0;
     }
 
-    public static boolean isForeignEndianFixedWidth(int codeRange) {
-        return (codeRange & MASK_FOREIGN_ENDIAN_MULTIBYTE) == FLAG_FOREIGN_ENDIAN;
-    }
-
     static boolean isFixedWidth(int codeRange) {
         return (codeRange & FLAG_MULTIBYTE) == 0;
     }