--- old/src/share/vm/prims/jvmtiExport.hpp	2016-11-03 14:16:47.000000000 -0700
+++ new/src/share/vm/prims/jvmtiExport.hpp	2016-11-03 14:16:47.000000000 -0700
@@ -326,10 +326,11 @@
     JVMTI_ONLY(return _should_post_class_file_load_hook);
     NOT_JVMTI(return false;)
   }
-  static void post_class_file_load_hook(Symbol* h_name, Handle class_loader,
+  // Return true if the class was modified by the hook.
+  static bool post_class_file_load_hook(Symbol* h_name, Handle class_loader,
                                         Handle h_protection_domain,
                                         unsigned char **data_ptr, unsigned char **end_ptr,
-                                        JvmtiCachedClassFileData **cache_ptr) NOT_JVMTI_RETURN;
+                                        JvmtiCachedClassFileData **cache_ptr) NOT_JVMTI_RETURN_(false);
   static void post_native_method_bind(Method* method, address* function_ptr) NOT_JVMTI_RETURN;
   static void post_compiled_method_load(nmethod *nm) NOT_JVMTI_RETURN;
   static void post_dynamic_code_generated(const char *name, const void *code_begin, const void *code_end) NOT_JVMTI_RETURN;