diff -r 844bf1deff1a -r 8dc742d9bbab src/hotspot/share/runtime/arguments.cpp
--- a/src/hotspot/share/runtime/arguments.cpp	Tue Feb 20 07:46:40 2018 -0500
+++ b/src/hotspot/share/runtime/arguments.cpp	Tue Feb 20 16:10:21 2018 +0100
@@ -1826,6 +1826,13 @@
   }
 #endif
 
+#if defined(IA32)
+  // Only server compiler can optimize safepoints well enough.
+  if (!is_server_compilation_mode_vm()) {
+    FLAG_SET_ERGO_IF_DEFAULT(bool, ThreadLocalHandshakes, false);
+  }
+#endif
+
   set_conservative_max_heap_alignment();
 
 #ifndef ZERO