diff -r 9a411a9a17f0 -r 8250a10cf60f src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp --- a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp Wed Jan 31 11:35:42 2018 +0100 +++ b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp Wed Jan 31 15:10:04 2018 +0100 @@ -1,6 +1,6 @@ /* - * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012, 2017 SAP SE. All rights reserved. + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2018 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -111,6 +111,10 @@ uc->uc_mcontext.jmp_context.iar = (uint64_t) new_pc; } +static address ucontext_get_lr(const ucontext_t * uc) { + return (address)uc->uc_mcontext.jmp_context.lr; +} + ExtendedPC os::fetch_frame_from_context(const void* ucVoid, intptr_t** ret_sp, intptr_t** ret_fp) { @@ -167,7 +171,8 @@ return false; } else { intptr_t* sp = os::Aix::ucontext_get_sp(uc); - *fr = frame(sp, (address)*sp); + address lr = ucontext_get_lr(uc); + *fr = frame(sp, lr); if (!fr->is_java_frame()) { assert(fr->safe_for_sender(thread), "Safety check"); assert(!fr->is_first_frame(), "Safety check");