--- a/src/hotspot/share/gc/z/zBarrierSet.cpp	Mon Sep 23 14:39:11 2019 -0400
+++ b/src/hotspot/share/gc/z/zBarrierSet.cpp	Mon Sep 23 14:49:04 2019 -0400
@@ -66,7 +66,7 @@
   assert((decorators & AS_NO_KEEPALIVE) == 0, "Unexpected decorator");
   //assert((decorators & ON_UNKNOWN_OOP_REF) == 0, "Unexpected decorator");
 
-  if (type == T_OBJECT || type == T_ARRAY) {
+  if (is_reference_type(type)) {
     assert((decorators & (IN_HEAP | IN_NATIVE)) != 0, "Where is reference?");
     // Barrier needed even when IN_NATIVE, to allow concurrent scanning.
     return true;