archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8205199: more Linux clang compile failures

Browse source 
Co-authored-by: Thomas Stuefe <thomas.stuefe@gmail.com>
Reviewed-by: dholmes, kbarrett, stuefe
This commit is contained in:
Arthur Eubanks 2018-06-22 17:49:21 -07:00 • committed by Martin Buchholz
parent 161dc40015
commit 6e0bd36f42
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/hotspot/share/utilities/debug.cpp
View file

@ -714,16 +714,13 @@ void initialize_assert_poison() {
}
}
static bool store_context(const void* context) {
if (memcpy(&g_stored_assertion_context, context, sizeof(ucontext_t)) == false) {
return false;
}
static void store_context(const void* context) {
memcpy(&g_stored_assertion_context, context, sizeof(ucontext_t));
#if defined(__linux) && defined(PPC64)
// on Linux ppc64, ucontext_t contains pointers into itself which have to be patched up
// after copying the context (see comment in sys/ucontext.h):
*((void**) &g_stored_assertion_context.uc_mcontext.regs) = &(g_stored_assertion_context.uc_mcontext.gp_regs);
#endif
return true;
}
bool handle_assert_poison_fault(const void* ucVoid, const void* faulting_address) {
@ -734,9 +731,8 @@ bool handle_assert_poison_fault(const void* ucVoid, const void* faulting_address
if (ucVoid) {
const intx my_tid = os::current_thread_id();
if (Atomic::cmpxchg(my_tid, &g_asserting_thread, (intx)0) == 0) {
if (store_context(ucVoid)) {
g_assertion_context = &g_stored_assertion_context;
}
store_context(ucVoid);
g_assertion_context = &g_stored_assertion_context;
}
}
return true;