cleanup

Author: JohnTortugo

src/hotspot/share/code/nmethod.cpp

@@ -1964,12 +1964,12 @@ void nmethod::invalidate_osr_method() {
   }
 }
 
-void nmethod::log_state_change(NMethodChangeReason statusReason) const {
+void nmethod::log_state_change(NMethodChangeReason reason) const {
   if (LogCompilation) {
     if (xtty != nullptr) {
       ttyLocker ttyl;  // keep the following output all in one block
       xtty->begin_elem("make_not_entrant thread='%zu' reason='%d'",
-                       os::current_thread_id(), statusReason);
+                       os::current_thread_id(), reason);
       log_identity(xtty);
       xtty->stamp();
       xtty->end_elem();
@@ -1978,7 +1978,7 @@ void nmethod::log_state_change(NMethodChangeReason statusReason) const {
 
   ResourceMark rm;
   stringStream ss(NEW_RESOURCE_ARRAY(char, 256), 256);
-  ss.print("made not entrant: %d", statusReason);
+  ss.print("made not entrant: %d", reason);
 
   CompileTask::print_ul(this, ss.freeze());
   if (PrintCompilation) {
@@ -1993,7 +1993,7 @@ void nmethod::unlink_from_method() {
 }
 
 // Invalidate code
-bool nmethod::make_not_entrant(NMethodChangeReason statusReason) {
+bool nmethod::make_not_entrant(NMethodChangeReason reason) {
   // This can be called while the system is already at a safepoint which is ok
   NoSafepointVerifier nsv;
 
@@ -2051,7 +2051,7 @@ bool nmethod::make_not_entrant(NMethodChangeReason statusReason) {
     assert(success, "Transition can't fail");
 
     // Log the transition once
-    log_state_change(statusReason);
+    log_state_change(reason);
 
     // Remove nmethod from method.
     unlink_from_method();

src/hotspot/share/code/nmethod.hpp

@@ -489,8 +489,6 @@ class nmethod : public CodeBlob {
     missing_exception_handler,
     uncommon_trap,
     zombie,
-    gc_unlinking,
-    gc_unlinking_cold,
     JVMCI_invalidate_nmethod,
     JVMCI_new_installation,
     JVMCI_replacing_with_new_code,
@@ -658,7 +656,7 @@ class nmethod : public CodeBlob {
   // alive.  It is used when an uncommon trap happens.  Returns true
   // if this thread changed the state of the nmethod or false if
   // another thread performed the transition.
-  bool  make_not_entrant(NMethodChangeReason statusReason);
+  bool  make_not_entrant(NMethodChangeReason reason);
   bool  make_not_used()    { return make_not_entrant(nmethod::not_used); }
 
   bool  is_marked_for_deoptimization() const { return deoptimization_status() != not_marked; }
@@ -972,7 +970,7 @@ class nmethod : public CodeBlob {
   // Logging
   void log_identity(xmlStream* log) const;
   void log_new_nmethod() const;
-  void log_state_change(NMethodChangeReason statusReason) const;
+  void log_state_change(NMethodChangeReason reason) const;
 
   // Prints block-level comments, including nmethod specific block labels:
   void print_nmethod_labels(outputStream* stream, address block_begin, bool print_section_labels=true) const;