src/hotspot/share/runtime/vm_version.cpp

*** 121,165 ****
  #endif
  }
  
  
  const char* Abstract_VM_Version::vm_info_string() {
    switch (Arguments::mode()) {
      case Arguments::_int:
!       return UseSharedSpaces ? "interpreted mode, sharing" : "interpreted mode";
      case Arguments::_mixed:
        if (UseSharedSpaces) {
          if (UseAOT) {
!           return "mixed mode, aot, sharing";
  #ifdef TIERED
          } else if(is_client_compilation_mode_vm()) {
!           return "mixed mode, emulated-client, sharing";
  #endif
          } else {
!           return "mixed mode, sharing";
           }
        } else {
          if (UseAOT) {
!           return "mixed mode, aot";
  #ifdef TIERED
          } else if(is_client_compilation_mode_vm()) {
!           return "mixed mode, emulated-client";
  #endif
          } else {
!           return "mixed mode";
          }
        }
      case Arguments::_comp:
  #ifdef TIERED
        if (is_client_compilation_mode_vm()) {
!          return UseSharedSpaces ? "compiled mode, emulated-client, sharing" : "compiled mode, emulated-client";
        }
  #endif
!       return UseSharedSpaces ? "compiled mode, sharing"    : "compiled mode";
    };
    ShouldNotReachHere();
    return "";
  }
  
  // NOTE: do *not* use stringStream. this function is called by
  //       fatal error handler. if the crash is in native thread,
  //       stringStream cannot get resource allocated and will SEGV.
--- 121,172 ----
  #endif
  }
  
  
  const char* Abstract_VM_Version::vm_info_string() {
+ #ifdef NO_SPECULATIVE_CTI
+ #define VM_MODE "hardened, "
+ #else
+ #define VM_MODE ""
+ #endif
+ 
    switch (Arguments::mode()) {
      case Arguments::_int:
!       return UseSharedSpaces ? VM_MODE "interpreted mode, sharing" : VM_MODE "interpreted mode";
      case Arguments::_mixed:
        if (UseSharedSpaces) {
          if (UseAOT) {
!           return VM_MODE "mixed mode, aot, sharing";
  #ifdef TIERED
          } else if(is_client_compilation_mode_vm()) {
!           return VM_MODE "mixed mode, emulated-client, sharing";
  #endif
          } else {
!           return VM_MODE "mixed mode, sharing";
           }
        } else {
          if (UseAOT) {
!           return VM_MODE "mixed mode, aot";
  #ifdef TIERED
          } else if(is_client_compilation_mode_vm()) {
!           return VM_MODE "mixed mode, emulated-client";
  #endif
          } else {
!           return VM_MODE "mixed mode";
          }
        }
      case Arguments::_comp:
  #ifdef TIERED
        if (is_client_compilation_mode_vm()) {
!          return UseSharedSpaces ? VM_MODE "compiled mode, emulated-client, sharing" : VM_MODE "compiled mode, emulated-client";
        }
  #endif
!       return UseSharedSpaces ? VM_MODE "compiled mode, sharing" : VM_MODE "compiled mode";
    };
    ShouldNotReachHere();
    return "";
+ #undef VM_MODE
  }
  
  // NOTE: do *not* use stringStream. this function is called by
  //       fatal error handler. if the crash is in native thread,
  //       stringStream cannot get resource allocated and will SEGV.