--- old/src/hotspot/share/c1/c1_LIRGenerator.cpp	2019-05-21 13:17:37.924951259 -0700
+++ new/src/hotspot/share/c1/c1_LIRGenerator.cpp	2019-05-21 13:17:37.624940546 -0700
@@ -791,10 +791,10 @@
     flags &= ~LIR_OpArrayCopy::always_slow_path;
   }
   if (!src->maybe_flattened_array()) {
-    flags &= ~LIR_OpArrayCopy::src_flat_check;
+    flags &= ~LIR_OpArrayCopy::src_valuetype_check;
   }
-  if (!dst->maybe_flattened_array()) {
-    flags &= ~LIR_OpArrayCopy::dst_flat_check;
+  if (!dst->maybe_flattened_array() && !dst->maybe_null_free_array()) {
+    flags &= ~LIR_OpArrayCopy::dst_valuetype_check;
   }
 
   if (!src_objarray)