--- a/src/hotspot/share/gc/shared/c1/barrierSetC1.hpp	Mon Sep 23 14:39:11 2019 -0400
+++ b/src/hotspot/share/gc/shared/c1/barrierSetC1.hpp	Mon Sep 23 14:49:04 2019 -0400
@@ -100,7 +100,7 @@
   BasicType type() const                 { return _type; }
   LIR_Opr resolved_addr() const          { return _resolved_addr; }
   void set_resolved_addr(LIR_Opr addr)   { _resolved_addr = addr; }
-  bool is_oop() const                    { return _type == T_ARRAY || _type == T_OBJECT; }
+  bool is_oop() const                    { return is_reference_type(_type); }
   DecoratorSet decorators() const        { return _decorators; }
   void clear_decorators(DecoratorSet ds) { _decorators &= ~ds; }
   bool is_raw() const                    { return (_decorators & AS_RAW) != 0; }