Skip to content

Commit

Permalink
Really fix #9366
Browse files Browse the repository at this point in the history 
pass a stack-copy of ctxThread in jl_throw_in_ctx to rec_backtrace_ctx
  • Loading branch information
@vtjnash @tkelman
vtjnash authored and tkelman committed Dec 16, 2014
1 parent 592f3d5 commit 0b44aca
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,8 @@ void restore_signals(void)
void jl_throw_in_ctx(jl_value_t *excpt, CONTEXT *ctxThread, int bt)
{
assert(excpt != NULL);
bt_size = bt ? rec_backtrace_ctx(bt_data, MAX_BT_SIZE, ctxThread) : 0;
CONTEXT Ctx = *ctxThread;
bt_size = bt ? rec_backtrace_ctx(bt_data, MAX_BT_SIZE, &Ctx) : 0;
jl_exception_in_transit = excpt;
#if defined(_CPU_X86_64_)
ctxThread->Rip = (DWORD64)&jl_rethrow;
Expand Down

4 comments on commit 0b44aca

@tkelman
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaBackports, though @vtjnash "could save the stack copy of the entire Context structure and just copy RSP" which he'll look into later. There's also apparently an openblas bug on atom he should report sooner or later.

@ivarne
Copy link
Member

@ivarne ivarne commented on 0b44aca Dec 19, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bump

@tkelman
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reference #9360 (comment) - this should be squashed along with 3 followup commits when backported

@tkelman
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and I don't think @vtjnash reported that openblas-on-atom bug yet

Please sign in to comment.