*** old/src/hotspot/share/services/diagnosticCommand.cpp	Thu Mar 29 13:44:20 2018
--- new/src/hotspot/share/services/diagnosticCommand.cpp	Thu Mar 29 13:44:20 2018

*** 31,41 ****
--- 31,40 ----
  #include "gc/shared/vmGCOperations.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/objArrayOop.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/typeArrayOop.inline.hpp"
  #include "runtime/globals.hpp"
  #include "runtime/handles.inline.hpp"
  #include "runtime/javaCalls.hpp"
  #include "runtime/os.hpp"
  #include "services/diagnosticArgument.hpp"
  #include "services/diagnosticCommand.hpp"

*** 222,234 ****
--- 221,233 ----
    _dcmdparser.add_dcmd_option(&_all);
  }
  
  void PrintVMFlagsDCmd::execute(DCmdSource source, TRAPS) {
    if (_all.value()) {
!     CommandLineFlags::printFlags(output(), true);
!     JVMFlag::printFlags(output(), true);
    } else {
!     CommandLineFlags::printSetFlags(output());
!     JVMFlag::printSetFlags(output());
    }
  }
  
  int PrintVMFlagsDCmd::num_arguments() {
      ResourceMark rm;

*** 255,267 ****
--- 254,266 ----
    if (_value.value() != NULL) {
      val = _value.value();
    }
  
    FormatBuffer<80> err_msg("%s", "");
!   int ret = WriteableFlags::set_flag(_flag.value(), val, JVMFlag::MANAGEMENT, err_msg);
  
!   if (ret != JVMFlag::SUCCESS) {
      output()->print_cr("%s", err_msg.buffer());
    }
  }
  
  int SetVMFlagDCmd::num_arguments() {