Skip to content

Commit 8091c74

Browse files
committed
---
yaml --- r: 6681 b: refs/heads/master c: f332643 h: refs/heads/master i: 6679: 3ee5e13 v: v3
1 parent def9e0b commit 8091c74

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: a195ab2dd9ee03dd7c811cf3962f0757fd675fc4
2+
refs/heads/master: f332643e7fef96f15db675dd50bf643199d8f6a5

trunk/src/rt/arch/i386/morestack.S

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,13 @@ MORESTACK:
122122

123123
subl $8, %esp // Alignment
124124

125+
// Now that we're on the return path we want to avoid
126+
// stomping on %eax
125127
#ifdef __APPLE__
126128
call 1f
127-
1: popl %eax
128-
movl L_upcall_del_stack$non_lazy_ptr-1b(%eax),%eax
129-
pushl %eax
129+
1: popl %ecx
130+
movl L_upcall_del_stack$non_lazy_ptr-1b(%ecx),%ecx
131+
pushl %ecx
130132
#else
131133
pushl $UPCALL_DEL_STACK
132134
#endif

0 commit comments

Comments
 (0)