--- old/src/share/vm/oops/instanceKlass.hpp	2016-11-16 09:06:11.138498552 +0100
+++ new/src/share/vm/oops/instanceKlass.hpp	2016-11-16 09:06:11.062498550 +0100
@@ -487,7 +487,7 @@
 
   // find a non-static or static field given its offset within the class.
   bool contains_field_offset(int offset) {
-    return instanceOopDesc::contains_field_offset(offset, nonstatic_field_size());
+    return instanceOopDesc::contains_field_offset(offset, nonstatic_field_size(), is_value());
   }
 
   bool find_local_field_from_offset(int offset, bool is_static, fieldDescriptor* fd) const;