Backport 69e4e338b19c0ffd2f0881be1bbb19a5642bc4d4

openjdk-bots · Jun 21, 2023 · 7760422 · 7760422
1 parent 48d7af6
commit 7760422
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp
@@ -909,7 +909,7 @@ void VMError::report(outputStream* st, bool _verbose) {
 
   STEP("printing code blobs if possible")
 
-     if (_verbose && _context) {
+     if (_verbose) {
        const int printed_capacity = max_error_log_print_code;
        address printed[printed_capacity];
        printed[0] = nullptr;
@@ -928,7 +928,8 @@ void VMError::report(outputStream* st, bool _verbose) {
              printed_len++;
            }
          } else {
-           frame fr = os::fetch_frame_from_context(_context);
+           frame fr = _context ? os::fetch_frame_from_context(_context)
+                               : os::current_frame();
            while (printed_len < limit && fr.pc() != nullptr) {
              if (print_code(st, _thread, fr.pc(), fr.pc() == _pc, printed, printed_capacity)) {
                printed_len++;