--- old/src/share/vm/oops/constantPool.hpp	2017-09-01 15:10:25.385911163 -0400
+++ new/src/share/vm/oops/constantPool.hpp	2017-09-01 15:10:24.021832689 -0400
@@ -716,9 +716,9 @@
 
   // CDS support
   void archive_resolved_references(Thread *THREAD) NOT_CDS_JAVA_HEAP_RETURN;
+  bool resolve_class_constants(TRAPS) NOT_CDS_JAVA_HEAP_RETURN_(true); 
   void remove_unshareable_info();
   void restore_unshareable_info(TRAPS);
-  bool resolve_class_constants(TRAPS);
   // The ConstantPool vtable is restored by this call when the ConstantPool is
   // in the shared archive.  See patch_klass_vtables() in metaspaceShared.cpp for
   // all the gory details.  SA, dtrace and pstack helpers distinguish metadata