--- old/src/share/vm/jvmci/jvmciJavaClasses.cpp	2016-11-03 14:16:38.000000000 -0700
+++ new/src/share/vm/jvmci/jvmciJavaClasses.cpp	2016-11-03 14:16:38.000000000 -0700
@@ -44,7 +44,7 @@
   fieldDescriptor fd;
   if (!ik->find_field(name_symbol, signature_symbol, &fd)) {
     ResourceMark rm;
-    fatal("Invalid layout of %s at %s", name_symbol->as_C_string(), ik->external_name());
+    fatal("Invalid layout of %s %s at %s", name_symbol->as_C_string(), signature_symbol->as_C_string(), ik->external_name());
   }
   guarantee(fd.is_static() == static_field, "static/instance mismatch");
   dest_offset = fd.offset();