[Graal] Adapt JDK-8361842: Move input validation checks to Java for java.lang.StringCoding intrinsics

Author: mur47x111

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/GraalHotSpotVMConfig.java

@@ -692,6 +692,8 @@ public boolean supportJVMTIVThreadNotification() {
     public final boolean deoptimizationSupportLargeAccessByteArrayVirtualization = //
                     getConstant("Deoptimization::_support_large_access_byte_array_virtualization", Boolean.class);
 
+    public final boolean verifyIntrinsicChecks = getFlag("VerifyIntrinsicChecks", Boolean.class);
+
     public final int l1LineSize = getFieldValue("CompilerToVM::Data::L1_line_size", Integer.class, "int", 0, "amd64".equals(osArch));
     public final boolean supportsAvx512SimdSort = getFieldValue("CompilerToVM::Data::supports_avx512_simd_sort", Boolean.class, "bool", false, "amd64".equals(osArch));
 

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotPlatformConfigurationProvider.java

@@ -32,10 +32,12 @@ public class HotSpotPlatformConfigurationProvider implements PlatformConfigurati
     private final BarrierSet barrierSet;
 
     private final boolean canVirtualizeLargeByteArrayAccess;
+    private final boolean shouldVerifyIntrinsicChecks;
 
     public HotSpotPlatformConfigurationProvider(GraalHotSpotVMConfig config, BarrierSet barrierSet) {
         this.barrierSet = barrierSet;
         this.canVirtualizeLargeByteArrayAccess = config.deoptimizationSupportLargeAccessByteArrayVirtualization;
+        this.shouldVerifyIntrinsicChecks = config.verifyIntrinsicChecks;
     }
 
     @Override
@@ -62,4 +64,9 @@ public boolean areLocksSideEffectFree() {
     public BarrierSet getBarrierSet() {
         return barrierSet;
     }
+
+    @Override
+    public boolean shouldVerifyIntrinsicChecks() {
+        return shouldVerifyIntrinsicChecks;
+    }
 }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/PlatformConfigurationProvider.java

@@ -82,4 +82,13 @@ default boolean requiresStrictLockOrder() {
     default boolean areLocksSideEffectFree() {
         return true;
     }
+
+    /**
+     * Callers of the intrinsics (e.g., StringCoding.countPositives) are responsible for intrinsic
+     * input validation. Enabling this option enforces additional checks within the intrinsic
+     * implementation.
+     */
+    default boolean shouldVerifyIntrinsicChecks() {
+        return false;
+    }
 }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StandardGraphBuilderPlugins.java

@@ -2598,13 +2598,27 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
         });
     }
 
+    private static void generateStringRangeCheck(GraphBuilderContext b, InvocationPluginHelper helper, ValueNode array, ValueNode off, ValueNode len) {
+        helper.intrinsicRangeCheck(off, Condition.LT, ConstantNode.forInt(0));
+        helper.intrinsicRangeCheck(len, Condition.LT, ConstantNode.forInt(0));
+
+        ValueNode arrayLength = b.add(new ArrayLengthNode(array));
+        ValueNode limit = b.add(AddNode.create(off, len, NodeView.DEFAULT));
+        helper.intrinsicRangeCheck(arrayLength, Condition.LT, limit);
+    }
+
     private static void registerStringCodingPlugins(InvocationPlugins plugins, Replacements replacements) {
         Registration r = new Registration(plugins, "java.lang.StringCoding", replacements);
-        r.register(new InvocationPlugin("implEncodeISOArray", byte[].class, int.class, byte[].class, int.class, int.class) {
+        r.register(new InvocationPlugin("encodeISOArray0", byte[].class, int.class, byte[].class, int.class, int.class) {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode sa, ValueNode sp,
                             ValueNode da, ValueNode dp, ValueNode len) {
                 try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
+                    if (b.getPlatformConfigurationProvider().shouldVerifyIntrinsicChecks()) {
+                        generateStringRangeCheck(b, helper, sa, sp, len);
+                        generateStringRangeCheck(b, helper, da, dp, len);
+                    }
+
                     int charElementShift = CodeUtil.log2(b.getMetaAccess().getArrayIndexScale(JavaKind.Char));
                     ValueNode src = helper.arrayElementPointer(sa, JavaKind.Byte, LeftShiftNode.create(sp, ConstantNode.forInt(charElementShift), NodeView.DEFAULT));
                     ValueNode dst = helper.arrayElementPointer(da, JavaKind.Byte, dp);
@@ -2613,28 +2627,30 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                 }
             }
         });
-        r.register(new InvocationPlugin("implEncodeAsciiArray", char[].class, int.class, byte[].class, int.class, int.class) {
+        r.register(new InvocationPlugin("encodeAsciiArray0", char[].class, int.class, byte[].class, int.class, int.class) {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode sa, ValueNode sp,
                             ValueNode da, ValueNode dp, ValueNode len) {
                 try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
+                    if (b.getPlatformConfigurationProvider().shouldVerifyIntrinsicChecks()) {
+                        generateStringRangeCheck(b, helper, sa, sp, len);
+                        generateStringRangeCheck(b, helper, da, dp, len);
+                    }
+
                     ValueNode src = helper.arrayElementPointer(sa, JavaKind.Char, sp);
                     ValueNode dst = helper.arrayElementPointer(da, JavaKind.Byte, dp);
                     b.addPush(JavaKind.Int, new EncodeArrayNode(src, dst, len, ASCII, JavaKind.Char));
                     return true;
                 }
             }
         });
-        r.register(new InvocationPlugin("countPositives", byte[].class, int.class, int.class) {
+        r.register(new InvocationPlugin("countPositives0", byte[].class, int.class, int.class) {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode ba, ValueNode off, ValueNode len) {
                 try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
-                    helper.intrinsicRangeCheck(off, Condition.LT, ConstantNode.forInt(0));
-                    helper.intrinsicRangeCheck(len, Condition.LT, ConstantNode.forInt(0));
-
-                    ValueNode arrayLength = b.add(new ArrayLengthNode(ba));
-                    ValueNode limit = b.add(AddNode.create(off, len, NodeView.DEFAULT));
-                    helper.intrinsicRangeCheck(arrayLength, Condition.LT, limit);
+                    if (b.getPlatformConfigurationProvider().shouldVerifyIntrinsicChecks()) {
+                        generateStringRangeCheck(b, helper, ba, off, len);
+                    }
 
                     ValueNode array = helper.arrayElementPointer(ba, JavaKind.Byte, off);
                     b.addPush(JavaKind.Int, new CountPositivesNode(array, len));