mirror of
https://github.com/corda/corda.git
synced 2025-01-19 11:16:54 +00:00
restore MyThread::ip in MyThread::CallTrace destructor
This is necessary to ensure we can unwind the stack properly on ARM after returning from a recursive invocation of vmInvoke.
This commit is contained in:
parent
42fd021acf
commit
a4c4d54cdd
@ -109,7 +109,7 @@ class MyThread: public Thread {
|
||||
|
||||
t->scratch = scratch;
|
||||
|
||||
doTransition(t, 0, stack, continuation, next);
|
||||
doTransition(t, ip, stack, continuation, next);
|
||||
}
|
||||
|
||||
MyThread* t;
|
||||
@ -2040,6 +2040,7 @@ findUnwindTarget(MyThread* t, void** targetIp, void** targetFrame,
|
||||
target = method;
|
||||
}
|
||||
} else {
|
||||
expect(t, ip);
|
||||
*targetIp = ip;
|
||||
*targetFrame = 0;
|
||||
*targetStack = static_cast<void**>(stack)
|
||||
|
Loading…
Reference in New Issue
Block a user