--- a/hotspot/src/share/vm/runtime/thread.cpp	Fri Jul 07 16:49:45 2017 +0000
+++ b/hotspot/src/share/vm/runtime/thread.cpp	Fri Jul 07 23:04:06 2017 +0200
@@ -2193,6 +2193,11 @@
   if (check_asyncs) {
     check_and_handle_async_exceptions();
   }
+#if INCLUDE_TRACE
+  if (is_trace_suspend()) {
+    TRACE_SUSPEND_THREAD(this);
+  }
+#endif
 }
 
 void JavaThread::send_thread_stop(oop java_throwable)  {
@@ -2423,6 +2428,11 @@
       fatal("missed deoptimization!");
     }
   }
+#if INCLUDE_TRACE
+  if (thread->is_trace_suspend()) {
+    TRACE_SUSPEND_THREAD(thread);
+  }
+#endif
 }
 
 // Slow path when the native==>VM/Java barriers detect a safepoint is in