--- old/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp	2018-10-05 16:57:01.243651994 +0200
+++ new/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp	2018-10-05 16:56:52.795631597 +0200
@@ -1427,6 +1427,10 @@
   return c;
 }
 
+bool ZBarrierSetC2::array_copy_requires_gc_barriers(bool tightly_coupled_alloc, BasicType type, bool is_clone, ArrayCopyPhase phase) const {
+  return type == T_OBJECT || type == T_ARRAY;
+}
+
 // == Verification ==
 
 #ifdef ASSERT
--- old/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp	2018-10-05 16:57:09.772672588 +0200
+++ new/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp	2018-10-05 16:57:01.374652311 +0200
@@ -194,7 +194,7 @@
   virtual void enqueue_useful_gc_barrier(Unique_Node_List &worklist, Node* node) const;
   virtual void register_potential_barrier_node(Node* node) const;
   virtual void unregister_potential_barrier_node(Node* node) const;
-  virtual bool array_copy_requires_gc_barriers(bool tightly_coupled_alloc, BasicType type, bool is_clone, ArrayCopyPhase phase) const { return true; }
+  virtual bool array_copy_requires_gc_barriers(bool tightly_coupled_alloc, BasicType type, bool is_clone, ArrayCopyPhase phase) const;
   virtual Node* step_over_gc_barrier(Node* c) const;
   // If the BarrierSetC2 state has kept macro nodes in its compilation unit state to be
   // expanded later, then now is the time to do so.