Skip to content
Permalink
Browse files
8266453: Shenandoah: Disable write protections before patching nmetho…
…d in nmethod_barrier on MacOSX/AArch64

Reviewed-by: rkennke
  • Loading branch information
zhengyu123 committed May 5, 2021
1 parent a05e8e2 commit 61bb6eca3e34b3f8382614edccd167f7ecefba65
Showing with 4 additions and 1 deletion.
  1. +4 −1 src/hotspot/share/gc/shenandoah/shenandoahBarrierSetNMethod.cpp
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, Red Hat, Inc. All rights reserved.
* Copyright (c) 2019, 2021, Red Hat, Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
#include "gc/shenandoah/shenandoahThreadLocalData.hpp"
#include "memory/iterator.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/threadWXSetters.inline.hpp"

bool ShenandoahBarrierSetNMethod::nmethod_entry_barrier(nmethod* nm) {
ShenandoahReentrantLock* lock = ShenandoahNMethod::lock_for_nmethod(nm);
@@ -45,6 +46,8 @@ bool ShenandoahBarrierSetNMethod::nmethod_entry_barrier(nmethod* nm) {
return true;
}

MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, Thread::current());)

if (nm->is_unloading()) {
// We don't need to take the lock when unlinking nmethods from
// the Method, because it is only concurrently unlinked by

1 comment on commit 61bb6ec

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on 61bb6ec May 5, 2021

Please sign in to comment.