--- old/src/hotspot/share/classfile/classLoader.hpp	2018-04-09 15:29:53.343590693 -0700
+++ new/src/hotspot/share/classfile/classLoader.hpp	2018-04-09 15:29:53.083566169 -0700
@@ -241,7 +241,7 @@
   CDS_ONLY(static ClassPathEntry* _module_path_entries;)
   CDS_ONLY(static ClassPathEntry* _last_module_path_entry;)
   CDS_ONLY(static void setup_app_search_path(const char* class_path);)
-  CDS_ONLY(static void setup_module_search_path(const char* path);)
+  CDS_ONLY(static void setup_module_search_path(const char* path, TRAPS);)
   static void add_to_app_classpath_entries(const char* path,
                                            ClassPathEntry* entry,
                                            bool check_for_duplicates);
@@ -292,8 +292,7 @@
                                            bool check_for_duplicates,
                                            bool is_boot_append,
                                            bool throw_exception=true);
-  CDS_ONLY(static void update_module_path_entry_list(const char *path,
-                                           bool throw_exception=true);)
+  CDS_ONLY(static void update_module_path_entry_list(const char *path, TRAPS);)
   static void print_bootclasspath();
 
   // Timing
@@ -390,7 +389,7 @@
   static void initialize();
   static void classLoader_init2(TRAPS);
   CDS_ONLY(static void initialize_shared_path();)
-  CDS_ONLY(static void initialize_module_path();)
+  CDS_ONLY(static void initialize_module_path(TRAPS);)
 
   static int compute_Object_vtable();
 
@@ -432,7 +431,7 @@
   static void* get_module_paths_misc_info();
   static void  exit_with_path_failure(const char* error, const char* message);
   static char* skip_uri_protocol(char* source);
-  static void  record_result(InstanceKlass* ik, const ClassFileStream* stream);
+  static void  record_result(InstanceKlass* ik, const ClassFileStream* stream, TRAPS);
 #endif
   static JImageLocationRef jimage_find_resource(JImageFile* jf, const char* module_name,
                                                 const char* file_name, jlong &size);