--- old/src/hotspot/share/runtime/safepointMechanism.inline.hpp	2017-10-23 17:10:28.406250084 +0200
+++ new/src/hotspot/share/runtime/safepointMechanism.inline.hpp	2017-10-23 17:10:27.996236610 +0200
@@ -39,11 +39,10 @@
 }
 
 bool SafepointMechanism::local_poll(Thread* thread) {
-  // Mutexes can be taken but none JavaThread. These cannot have handshakes
-  // operation but they must stop for safepoints.
   if (thread->is_Java_thread()) {
     return local_poll_armed((JavaThread*)thread);
   } else {
+    // If the poll is on a non-java thread we can only check the global state.
     return global_poll();
   }
 }