Skip to content

Commit 5e18837

Browse files
authored
Update to jdk-20+16
28098: Minimal build failed with --disable-precompiled-headers 28096: LA port of 8293851: hs_err should print more stack in hex dump
1 parent e922be0 commit 5e18837

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/hotspot/cpu/loongarch/nativeInst_loongarch.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "nativeInst_loongarch.hpp"
3232
#include "oops/oop.inline.hpp"
3333
#include "runtime/handles.hpp"
34+
#include "runtime/safepoint.hpp"
3435
#include "runtime/sharedRuntime.hpp"
3536
#include "runtime/stubRoutines.hpp"
3637
#include "utilities/ostream.hpp"

src/hotspot/cpu/loongarch/templateInterpreterGenerator_loongarch.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
#include "precompiled.hpp"
2727
#include "asm/macroAssembler.hpp"
28+
#include "classfile/javaClasses.hpp"
2829
#include "gc/shared/barrierSetAssembler.hpp"
2930
#include "interpreter/bytecodeHistogram.hpp"
3031
#include "interpreter/interp_masm.hpp"

src/hotspot/os_cpu/linux_loongarch/os_linux_loongarch.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -442,9 +442,8 @@ void os::print_tos_pc(outputStream *st, const void *context) {
442442

443443
const ucontext_t* uc = (const ucontext_t*)context;
444444

445-
intptr_t *sp = (intptr_t *)os::Linux::ucontext_get_sp(uc);
446-
st->print_cr("Top of Stack: (sp=" PTR_FORMAT ")", p2i(sp));
447-
print_hex_dump(st, (address)(sp - 32), (address)(sp + 32), sizeof(intptr_t));
445+
address sp = (address)os::Linux::ucontext_get_sp(uc);
446+
print_tos(st, sp);
448447
st->cr();
449448

450449
// Note: it may be unsafe to inspect memory near pc. For example, pc may

0 commit comments

Comments
 (0)