src/share/vm/code/debugInfoRec.cpp

@@ -78,14 +78,14 @@
     return NULL;
   }
 };
 
 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;
   }
 
   // If the flag is set manually, use it, whether true or false.