Index: vm/gc_gen/src/common/gc_for_vm.cpp =================================================================== --- vm/gc_gen/src/common/gc_for_vm.cpp (revision 540468) +++ vm/gc_gen/src/common/gc_for_vm.cpp (working copy) @@ -27,6 +27,7 @@ #include "../thread/collector.h" #include "../verify/verify_live_heap.h" #include "../finalizer_weakref/finalizer_weakref.h" +#include "port_threadunsafe.h" #ifdef USE_32BITS_HASHCODE #include "hashcode.h" #endif @@ -289,7 +290,9 @@ Boolean gc_clear_mutator_block_flag() { + UNSAFE_REGION_START Boolean old_flag = mutator_need_block; mutator_need_block = FALSE; + UNSAFE_REGION_END return old_flag; }