changeset 9979:1a2211dc50c6

Rename _fixup_jlrM_list to _fixup_modulefield_list.
author lfoltan
date Tue, 22 Dec 2015 10:35:04 -0500
parents c5392dffff36
children 44007466d81e
files src/share/vm/classfile/javaClasses.cpp src/share/vm/classfile/javaClasses.hpp src/share/vm/classfile/moduleEntry.cpp
diffstat 3 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/classfile/javaClasses.cpp	Wed Dec 16 18:50:56 2015 -0800
+++ b/src/share/vm/classfile/javaClasses.cpp	Tue Dec 22 10:35:04 2015 -0500
@@ -863,12 +863,12 @@
 
     // Keep list of classes needing java.base module fixup.
     if (!ModuleEntryTable::javabase_defined()) {
-      if (fixup_jlrM_list() == NULL) {
+      if (fixup_modulefield_list() == NULL) {
         GrowableArray<Klass*>* list =
           new (ResourceObj::C_HEAP, mtClass) GrowableArray<Klass*>(500, true);
-        set_fixup_jlrM_list(list);
+        set_fixup_modulefield_list(list);
       }
-      fixup_jlrM_list()->push(k());
+      fixup_modulefield_list()->push(k());
     }
   } else {
     if (fixup_mirror_list() == NULL) {
@@ -880,7 +880,7 @@
   }
 }
 
-void java_lang_Class::fixup_jlrM(KlassHandle k, Handle module, TRAPS) {
+void java_lang_Class::fixup_modulefield(KlassHandle k, Handle module, TRAPS) {
   assert(_module_offset != 0, "must have been computed already");
   java_lang_Class::set_module(k->java_mirror(), module());
 }
@@ -3619,7 +3619,7 @@
 int java_lang_Class::_init_lock_offset;
 int java_lang_Class::_signers_offset;
 GrowableArray<Klass*>* java_lang_Class::_fixup_mirror_list = NULL;
-GrowableArray<Klass*>* java_lang_Class::_fixup_jlrM_list = NULL;
+GrowableArray<Klass*>* java_lang_Class::_fixup_modulefield_list = NULL;
 int java_lang_Throwable::backtrace_offset;
 int java_lang_Throwable::detailMessage_offset;
 int java_lang_Throwable::cause_offset;
--- a/src/share/vm/classfile/javaClasses.hpp	Wed Dec 16 18:50:56 2015 -0800
+++ b/src/share/vm/classfile/javaClasses.hpp	Tue Dec 22 10:35:04 2015 -0500
@@ -261,7 +261,7 @@
   static int classRedefinedCount_offset;
 
   static GrowableArray<Klass*>* _fixup_mirror_list;
-  static GrowableArray<Klass*>* _fixup_jlrM_list;
+  static GrowableArray<Klass*>* _fixup_modulefield_list;
 
   static void set_init_lock(oop java_class, oop init_lock);
   static void set_protection_domain(oop java_class, oop protection_domain);
@@ -277,7 +277,7 @@
   static void fixup_mirror(KlassHandle k, TRAPS);
   static oop  create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS);
 
-  static void fixup_jlrM(KlassHandle k, Handle module, TRAPS);
+  static void fixup_modulefield(KlassHandle k, Handle module, TRAPS);
 
   // Conversion
   static Klass* as_Klass(oop java_class);
@@ -332,11 +332,11 @@
     _fixup_mirror_list = v;
   }
 
-  static GrowableArray<Klass*>* fixup_jlrM_list() {
-    return _fixup_jlrM_list;
+  static GrowableArray<Klass*>* fixup_modulefield_list() {
+    return _fixup_modulefield_list;
   }
-  static void set_fixup_jlrM_list(GrowableArray<Klass*>* v) {
-    _fixup_jlrM_list = v;
+  static void set_fixup_modulefield_list(GrowableArray<Klass*>* v) {
+    _fixup_modulefield_list = v;
   }
 
   // Debugging
--- a/src/share/vm/classfile/moduleEntry.cpp	Wed Dec 16 18:50:56 2015 -0800
+++ b/src/share/vm/classfile/moduleEntry.cpp	Tue Dec 22 10:35:04 2015 -0500
@@ -315,18 +315,18 @@
   java_lang_Class::set_module(Universe::void_mirror(), jlrM_handle());
 
   // Do the fixups for classes that have already been created.
-  GrowableArray <Klass*>* list = java_lang_Class::fixup_jlrM_list();
+  GrowableArray <Klass*>* list = java_lang_Class::fixup_modulefield_list();
   int list_length = list->length();
   for (int i = 0; i < list_length; i++) {
     Klass* k = list->at(i);
     assert(k->is_klass(), "List should only hold classes");
     EXCEPTION_MARK;
     KlassHandle kh(THREAD, k);
-    java_lang_Class::fixup_jlrM(kh, jlrM_handle, CATCH);
+    java_lang_Class::fixup_modulefield(kh, jlrM_handle, CATCH);
   }
 
-  delete java_lang_Class::fixup_jlrM_list();
-  java_lang_Class::set_fixup_jlrM_list(NULL);
+  delete java_lang_Class::fixup_modulefield_list();
+  java_lang_Class::set_fixup_modulefield_list(NULL);
 }
 
 #ifndef PRODUCT