mirror of
https://github.com/corda/corda.git
synced 2025-01-05 20:54:13 +00:00
fix merge conflict bug preventing the bootimage code from seeing, marking, and fixing jsr addresses
This commit is contained in:
parent
f58f7b3bdf
commit
4b2d74f656
@ -3111,7 +3111,7 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip,
|
||||
frame->storedObject(index);
|
||||
}
|
||||
|
||||
frame->pushAddress(frame->machineIp(ip));
|
||||
frame->pushAddress(frame->addressOperand(c->machineIp(ip)));
|
||||
|
||||
c->jmp(frame->machineIp(newIp));
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user