--- old/src/hotspot/share/classfile/classLoaderExt.cpp	2018-04-09 15:29:54.042656626 -0700
+++ new/src/hotspot/share/classfile/classLoaderExt.cpp	2018-04-09 15:29:53.779631819 -0700
@@ -71,7 +71,7 @@
   }
 }
 
-void ClassLoaderExt::process_module_table(ModuleEntryTable* met) {
+void ClassLoaderExt::process_module_table(ModuleEntryTable* met, TRAPS) {
   ResourceMark rm;
   for (int i = 0; i < met->table_size(); i++) {
     for (ModuleEntry* m = met->bucket(i); m != NULL;) {
@@ -79,20 +79,19 @@
       if (strncmp(path, "file:", 5) == 0 && ClassLoader::string_ends_with(path, ".jar")) {
         m->print();
         path = ClassLoader::skip_uri_protocol(path);
-        ClassLoader::setup_module_search_path(path);
+        ClassLoader::setup_module_search_path(path, THREAD);
       }
       m = m->next();
     }
   }
 }
-void ClassLoaderExt::setup_module_search_path() {
+void ClassLoaderExt::setup_module_search_path(TRAPS) {
   assert(DumpSharedSpaces, "this function is only used with -Xshare:dump and -XX:+UseAppCDS");
   _app_module_paths_start_index = ClassLoader::num_boot_classpath_entries() +
                               ClassLoader::num_app_classpath_entries();
-  Thread* thread = Thread::current();
-  Handle system_class_loader (thread, SystemDictionary::java_system_loader());
+  Handle system_class_loader (THREAD, SystemDictionary::java_system_loader());
   ModuleEntryTable* met = Modules::get_module_entry_table(system_class_loader);
-  process_module_table(met);
+  process_module_table(met, THREAD);
 }
 
 char* ClassLoaderExt::read_manifest(ClassPathEntry* entry, jint *manifest_size, bool clean_text, TRAPS) {
@@ -222,9 +221,9 @@
   }
 }
 
-void ClassLoaderExt::setup_module_paths() {
+void ClassLoaderExt::setup_module_paths(TRAPS) {
   if (UseAppCDS) {
-    ClassLoaderExt::setup_module_search_path();
+    ClassLoaderExt::setup_module_search_path(THREAD);
   }
 }