src/hotspot/share/gc/g1/g1ParScanThreadState.cpp

@@ -542,11 +542,12 @@
        update_bot_after_copying(obj, word_sz);
      }
  
      // Most objects are not arrays, so do one array check rather than
      // checking for each array category for each object.
-     if (klass->is_array_klass()) {
+     // CMH: Valhalla flat arrays can split this work up, but for now, doesn't
+     if (klass->is_array_klass() && !klass->is_flatArray_klass()) {
        if (klass->is_objArray_klass()) {
          start_partial_objarray(dest_attr, old, obj);
        } else {
          // Nothing needs to be done for typeArrays.  Body doesn't contain
          // any oops to scan, and the type in the klass will already be handled