--- old/src/hotspot/share/ci/ciInstanceKlass.hpp	2018-12-18 15:04:24.139540816 +0100
+++ new/src/hotspot/share/ci/ciInstanceKlass.hpp	2018-12-18 15:04:19.333578679 +0100
@@ -189,6 +189,8 @@
   ciInstanceKlass* get_canonical_holder(int offset);
   ciField* get_field_by_offset(int field_offset, bool is_static);
   ciField* get_field_by_name(ciSymbol* name, ciSymbol* signature, bool is_static);
+  // get field descriptor at field_offset ignoring flattening
+  ciField* get_non_flattened_field_by_offset(int field_offset);
 
   // total number of nonstatic fields (including inherited):
   int nof_nonstatic_fields() {