--- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Thu Jun 29 19:09:04 2017 +0000
+++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Mon Jun 26 15:25:25 2017 +0200
@@ -378,14 +378,7 @@
   thread->set_thread_state(_thread_in_native_trans);
 
   // Make sure new state is visible in the GC thread
-  if (os::is_MP()) {
-    if (UseMembar) {
-      OrderAccess::fence();
-    }
-    else {
-      InterfaceSupport::serialize_memory(thread);
-    }
-  }
+  InterfaceSupport::serialize_thread_state(thread);
 
   // Handle safepoint operations, pending suspend requests,
   // and pending asynchronous exceptions.