--- old/src/share/vm/code/debugInfoRec.cpp	2016-10-25 10:40:06.529775776 +0200
+++ new/src/share/vm/code/debugInfoRec.cpp	2016-10-25 10:40:06.482775745 +0200
@@ -80,10 +80,10 @@
 };
 
 static inline bool compute_recording_non_safepoints() {
-  if (JvmtiExport::should_post_compiled_method_load()
+  if ((EnableEventTracing || JvmtiExport::should_post_compiled_method_load())
       && FLAG_IS_DEFAULT(DebugNonSafepoints)) {
     // The default value of this flag is taken to be true,
-    // if JVMTI is looking at nmethod codes.
+    // if event tracing is enabled or JVMTI is looking at nmethod codes.
     // We anticipate that JVMTI may wish to participate in profiling.
     return true;
   }