8264359: Compiler directives should enable DebugNonSafepoints when PrintAssembly is requested

Reviewed-by: kvn, thartmann

Author: Nils Eliasson

src/hotspot/share/compiler/compilerDirectives.cpp

@@ -30,6 +30,7 @@
 #include "compiler/compilerOracle.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
+#include "runtime/globals_extension.hpp"
 
 CompilerDirectives::CompilerDirectives() : _next(NULL), _match(NULL), _ref_count(0) {
   _c1_store = new DirectiveSet(this);
@@ -104,6 +105,10 @@ void DirectiveSet::finalize(outputStream* st) {
   if (LogOption && !LogCompilation) {
     st->print_cr("Warning:  +LogCompilation must be set to enable compilation logging from directives");
   }
+  if (PrintAssemblyOption && FLAG_IS_DEFAULT(DebugNonSafepoints)) {
+    warning("printing of assembly code is enabled; turning on DebugNonSafepoints to gain additional output");
+    DebugNonSafepoints = true;
+  }
 
   // if any flag has been modified - set directive as enabled
   // unless it already has been explicitly set.

src/hotspot/share/compiler/compilerOracle.cpp

@@ -911,9 +911,6 @@ void compilerOracle_init() {
   if (has_command(CompileCommand::Print)) {
     if (PrintAssembly) {
       warning("CompileCommand and/or %s file contains 'print' commands, but PrintAssembly is also enabled", default_cc_file);
-    } else if (FLAG_IS_DEFAULT(DebugNonSafepoints)) {
-      warning("printing of assembly code is enabled; turning on DebugNonSafepoints to gain additional output");
-      DebugNonSafepoints = true;
     }
   }
 }