--- old/src/hotspot/share/c1/c1_GraphBuilder.cpp	2019-03-11 16:11:22.507308346 -0700
+++ new/src/hotspot/share/c1/c1_GraphBuilder.cpp	2019-03-11 16:11:22.267299742 -0700
@@ -1716,7 +1716,7 @@
         }
         LoadField* load_field = new LoadField(append(obj), offset, field, true,
                                         state_before, needs_patching);
-        if (field->is_q_type()) {
+        if (field->is_flattenable()) {
           load_field->set_never_null(true);
         }
         push(type, append(load_field));