Move code to os::current_thread_wx

Author: parttimenerd

src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp

@@ -75,7 +75,7 @@ template<> struct BasicTypeToJni<T_DOUBLE>  { static const jdouble  jni_type; };
 template<int BType, typename JniType = decltype(BasicTypeToJni<BType>::jni_type)>
 JniType static_fast_get_field_wrapper(JNIEnv *env, jobject obj, jfieldID fieldID) {
   JavaThread* thread = JavaThread::thread_from_jni_environment(env);
-  os::ThreadWXEnable wx(os::WXExec);
+  os::current_thread_wx::Enable wx(os::current_thread_wx::Exec);
   address get_field_addr = generated_fast_get_field[BType - T_BOOLEAN];
   return ((JniType(*)(JNIEnv *env, jobject obj, jfieldID fieldID))get_field_addr)(env, obj, fieldID);
 }

src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp

@@ -205,7 +205,7 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
                                              ucontext_t* uc, JavaThread* thread) {
   // Enable WXWrite: this function is called by the signal handler at arbitrary
   // point of execution.
-  os::ThreadWXEnable wx(os::WXWrite);
+  os::current_thread_wx::Enable wx(os::current_thread_wx::Write);
 
   // decide if this trap can be handled by a stub
   address stub = NULL;
@@ -536,25 +536,25 @@ void os::verify_stack_alignment() {
 
 #ifdef __APPLE__
 
-static THREAD_LOCAL os::WXMode _wx_state = os::WXWrite;
+static THREAD_LOCAL os::current_thread_wx::WXMode _wx_state = os::current_thread_wx::Write;
 
 int os::extra_bang_size_in_bytes() {
   // AArch64 does not require the additional stack bang.
   return 0;
 }
 
-os::WXMode os::current_thread_change_wx(WXMode new_state) {
+os::current_thread_wx::WXMode os::current_thread_wx::change(WXMode new_state) {
   WXMode old = _wx_state;
   _wx_state = new_state;
-  pthread_jit_write_protect_np(_wx_state == os::WXExec);
+  pthread_jit_write_protect_np(_wx_state == os::current_thread_wx::Exec);
   return old;
 }
 
-void os::current_thread_init_wx() {
-  current_thread_change_wx(os::WXWrite);
+void os::current_thread_wx::init() {
+  change(os::current_thread_wx::Write);
 }
 
-void os::current_thread_assert_wx_state(WXMode expected) {
+void os::current_thread_wx::assert_wx(WXMode expected) {
   assert(_wx_state == expected, "wrong state");
 }
 #endif

src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.hpp

@@ -41,29 +41,36 @@
   }
 
   #ifdef __APPLE__
-  enum WXMode {
-    WXWrite,
-    WXExec
-  };
 
-  // Enables write or execute access to writeable and executable pages.
-  // returns the previous state
-  static WXMode current_thread_change_wx(WXMode new_state);
+  class current_thread_wx {
+  public:
 
-  // initializes the WXMode to WXWrite, as writeable pages are the default here
-  static void current_thread_init_wx();
+    enum WXMode {
+      Write,
+      Exec
+    };
 
-  static void current_thread_assert_wx_state(WXMode expected);
+    // Enables write or execute access to writeable and executable pages.
+    // returns the previous state
+    static WXMode change(WXMode new_state);
 
-  class ThreadWXEnable  {
-    WXMode _old_mode;
-  public:
-    ThreadWXEnable(WXMode new_mode) :
-      _old_mode(os::current_thread_change_wx(new_mode))
-    { }
-    ~ThreadWXEnable() {
-      os::current_thread_change_wx(_old_mode);
-    }
+    // initializes the WXMode to WXWrite, as writeable pages are the default here
+    static void init();
+
+    static void assert_wx(WXMode expected);
+
+    // RAII object to set a specific WXMode and reset it to the previous mode
+    // on destruction
+    class Enable  {
+      WXMode _old_mode;
+    public:
+      Enable(WXMode new_mode) :
+        _old_mode(change(new_mode))
+      { }
+      ~Enable() {
+        change(_old_mode);
+      }
+    };
   };
   #endif // __APPLE__
 #endif // OS_CPU_BSD_AARCH64_OS_BSD_AARCH64_HPP

src/hotspot/share/c1/c1_Runtime1.cpp

@@ -1267,7 +1267,7 @@ void Runtime1::patch_code(JavaThread* current, Runtime1::StubID stub_id) {
 
   // Enable WXWrite: the function is called by c1 stub as a runtime function
   // (see another implementation above).
-  MACOS_AARCH64_ONLY(os::ThreadWXEnable wx(os::WXWrite));
+  MACOS_AARCH64_ONLY(os::current_thread_wx::Enable wx(os::current_thread_wx::Write));
 
   if (TracePatching) {
     tty->print_cr("Deoptimizing because patch is needed");

src/hotspot/share/code/nmethod.cpp

@@ -2880,7 +2880,7 @@ void nmethod::decode2(outputStream* ost) const {
 #endif
 
   // Decoding an nmethod can write to a PcDescCache (see PcDescCache::add_pc_desc)
-  MACOS_AARCH64_ONLY(os::ThreadWXEnable wx(os::WXWrite);)
+  MACOS_AARCH64_ONLY(os::current_thread_wx::Enable wx(os::current_thread_wx::Write);)
 
   st->cr();
   this->print(st);

src/hotspot/share/gc/shared/barrierSetNMethod.cpp

@@ -52,7 +52,7 @@ bool BarrierSetNMethod::supports_entry_barrier(nmethod* nm) {
 int BarrierSetNMethod::nmethod_stub_entry_barrier(address* return_address_ptr) {
   // Enable WXWrite: the function is called directly from nmethod_entry_barrier
   // stub.
-  MACOS_AARCH64_ONLY(os::ThreadWXEnable wx(os::WXWrite));
+  MACOS_AARCH64_ONLY(os::current_thread_wx::Enable wx(os::current_thread_wx::Write));
 
   address return_address = *return_address_ptr;
   AARCH64_PORT_ONLY(return_address = pauth_strip_pointer(return_address));

src/hotspot/share/gc/shenandoah/shenandoahBarrierSetNMethod.cpp

@@ -46,7 +46,7 @@ bool ShenandoahBarrierSetNMethod::nmethod_entry_barrier(nmethod* nm) {
     return true;
   }
 
-  MACOS_AARCH64_ONLY(os::ThreadWXEnable wx(os::WXWrite);)
+  MACOS_AARCH64_ONLY(os::current_thread_wx::Enable wx(os::current_thread_wx::Write);)
 
   if (nm->is_unloading()) {
     // We don't need to take the lock when unlinking nmethods from

src/hotspot/share/gc/z/zBarrierSetNMethod.cpp

@@ -41,7 +41,7 @@ bool ZBarrierSetNMethod::nmethod_entry_barrier(nmethod* nm) {
     return true;
   }
 
-  MACOS_AARCH64_ONLY(os::ThreadWXEnable wx(os::WXWrite));
+  MACOS_AARCH64_ONLY(os::current_thread_wx::Enable wx(os::current_thread_wx::Write));
 
   if (nm->is_unloading()) {
     // We don't need to take the lock when unlinking nmethods from

src/hotspot/share/interpreter/interpreterRuntime.cpp

@@ -983,7 +983,7 @@ JRT_END
 
 nmethod* InterpreterRuntime::frequency_counter_overflow(JavaThread* current, address branch_bcp) {
   // Enable WXWrite: the function is called directly by interpreter.
-  MACOS_AARCH64_ONLY(os::ThreadWXEnable wx(os::WXWrite));
+  MACOS_AARCH64_ONLY(os::current_thread_wx::Enable wx(os::current_thread_wx::Write));
 
   // frequency_counter_overflow_inner can throw async exception.
   nmethod* nm = frequency_counter_overflow_inner(current, branch_bcp);

src/hotspot/share/jvmci/jvmciCompilerToVM.cpp

@@ -108,7 +108,7 @@ Handle JavaArgumentUnboxer::next_arg(BasicType expectedType) {
 
 // Bring the JVMCI compiler thread into the VM state.
 #define JVMCI_VM_ENTRY_MARK                                       \
-  MACOS_AARCH64_ONLY(os::ThreadWXEnable __wx(os::WXWrite));               \
+  MACOS_AARCH64_ONLY(os::current_thread_wx::Enable __wx(os::current_thread_wx::Write));               \
   ThreadInVMfromNative __tiv(thread);                             \
   HandleMarkCleaner __hm(thread);                                 \
   JavaThread* THREAD = thread;                                        \