--- old/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp	2019-09-11 09:50:33.190535574 -0400
+++ new/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp	2019-09-11 09:50:32.737891838 -0400
@@ -120,7 +120,7 @@
   Node* base() const              { return _base; }
   C2AccessValuePtr& addr() const  { return _addr; }
   BasicType type() const          { return _type; }
-  bool is_oop() const             { return _type == T_OBJECT || _type == T_ARRAY; }
+  bool is_oop() const             { return is_reference_type(_type); }
   bool is_raw() const             { return (_decorators & AS_RAW) != 0; }
   Node* raw_access() const        { return _raw_access; }