--- old/src/hotspot/share/ci/ciInstanceKlass.cpp	2018-10-25 10:46:49.184993686 +0200
+++ new/src/hotspot/share/ci/ciInstanceKlass.cpp	2018-10-25 10:46:39.826971990 +0200
@@ -554,6 +554,12 @@
   _has_injected_fields = has_injected_fields;
 }
 
+bool ciInstanceKlass::has_object_fields() const {
+  GUARDED_VM_ENTRY(
+      return get_instanceKlass()->nonstatic_oop_map_size() > 0;
+    );
+}
+
 // ------------------------------------------------------------------
 // ciInstanceKlass::find_method
 //