test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadConstantArrayElementDataProvider.java

*** 46,57 ****
  import jdk.vm.ci.meta.ResolvedJavaField;
  
  public class ReadConstantArrayElementDataProvider {
  
      // Non-stable array fields names mapped to their base offsets and index scale
!     private static final List<ArrayFieldParams> NON_STABLE_ARRAY_NAMES
!             = new LinkedList<>();
  
      static {
          NON_STABLE_ARRAY_NAMES.add(
                  new ArrayFieldParams("booleanArrayWithValues", Unsafe.ARRAY_BOOLEAN_BASE_OFFSET,
                               Unsafe.ARRAY_BOOLEAN_INDEX_SCALE));
--- 46,56 ----
  import jdk.vm.ci.meta.ResolvedJavaField;
  
  public class ReadConstantArrayElementDataProvider {
  
      // Non-stable array fields names mapped to their base offsets and index scale
!     private static final List<ArrayFieldParams> NON_STABLE_ARRAY_NAMES = new LinkedList<>();
  
      static {
          NON_STABLE_ARRAY_NAMES.add(
                          new ArrayFieldParams("booleanArrayWithValues", Unsafe.ARRAY_BOOLEAN_BASE_OFFSET,
                                          Unsafe.ARRAY_BOOLEAN_INDEX_SCALE));
*** 107,118 ****
                                                  Unsafe.ARRAY_OBJECT_BASE_OFFSET,
                                                  Unsafe.ARRAY_OBJECT_INDEX_SCALE));
      }
  
      // Stable array fields names mapped to their base offsets and index scale
!     private static final List<ArrayFieldParams> STABLE_ARRAY_NAMES
!             = new LinkedList<>();
  
      static {
          NON_STABLE_ARRAY_NAMES.stream().forEach((entry) -> {
              String nsFieldName = entry.name;
              char firstChar = nsFieldName.charAt(0);
--- 106,116 ----
                          Unsafe.ARRAY_OBJECT_BASE_OFFSET,
                          Unsafe.ARRAY_OBJECT_INDEX_SCALE));
      }
  
      // Stable array fields names mapped to their base offsets and index scale
!     private static final List<ArrayFieldParams> STABLE_ARRAY_NAMES = new LinkedList<>();
  
      static {
          NON_STABLE_ARRAY_NAMES.stream().forEach((entry) -> {
              String nsFieldName = entry.name;
              char firstChar = nsFieldName.charAt(0);
*** 143,157 ****
                          i,
                          i == 0 ? getJavaConstant(fieldName) : null,
                          "array field \"" + fieldName + "\" for index " + i});
              });
          }
!         Stream<Map.Entry<ResolvedJavaField, JavaConstant>> arraysStream1
!                 = Stream.concat(ARRAYS_MAP.entrySet().stream(),
                                  ARRAY_ARRAYS_MAP.entrySet().stream());
!         Stream<Map.Entry<ResolvedJavaField, JavaConstant>> arraysStream2
!                 = Stream.concat(STABLE_ARRAYS_MAP.entrySet().stream(),
                                  STABLE_ARRAY_ARRAYS_MAP.entrySet().stream());
          Stream.concat(arraysStream1, arraysStream2).forEach((array) -> {
              for (int i : new int[]{-1, 2}) {
                  cfgSet.add(new Object[]{
                          array.getValue(),
--- 141,153 ----
                                  i,
                                  i == 0 ? getJavaConstant(fieldName) : null,
                                  "array field \"" + fieldName + "\" for index " + i});
              });
          }
!         Stream<Map.Entry<ResolvedJavaField, JavaConstant>> arraysStream1 = Stream.concat(ARRAYS_MAP.entrySet().stream(),
                          ARRAY_ARRAYS_MAP.entrySet().stream());
!         Stream<Map.Entry<ResolvedJavaField, JavaConstant>> arraysStream2 = Stream.concat(STABLE_ARRAYS_MAP.entrySet().stream(),
                          STABLE_ARRAY_ARRAYS_MAP.entrySet().stream());
          Stream.concat(arraysStream1, arraysStream2).forEach((array) -> {
              for (int i : new int[]{-1, 2}) {
                  cfgSet.add(new Object[]{
                                  array.getValue(),