diff options
| author | Daniel Morsing <daniel.morsing@gmail.com> | 2013-01-04 17:07:21 +0100 |
|---|---|---|
| committer | Daniel Morsing <daniel.morsing@gmail.com> | 2013-01-04 17:07:21 +0100 |
| commit | f1e4ee3f49fd19d72fa3bbcbce4aab5c2fbef2ed (patch) | |
| tree | c91b25e8611cfa14f4c87004cdc55da74f8b6fb5 /src | |
| parent | 62dfa9c47d33368400cfa1f0b4fade7d047992ee (diff) | |
| download | go-f1e4ee3f49fd19d72fa3bbcbce4aab5c2fbef2ed.tar.xz | |
cmd/5g, cmd/6g, cmd/8g: flush return parameters in case of panic.
Fixes #4066.
R=rsc, minux.ma
CC=golang-dev
https://golang.org/cl/7040044
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/5g/reg.c | 6 | ||||
| -rw-r--r-- | src/cmd/6g/reg.c | 6 | ||||
| -rw-r--r-- | src/cmd/8g/reg.c | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/src/cmd/5g/reg.c b/src/cmd/5g/reg.c index 5f7ed2e88d..584ffc2534 100644 --- a/src/cmd/5g/reg.c +++ b/src/cmd/5g/reg.c @@ -1075,8 +1075,12 @@ prop(Reg *r, Bits ref, Bits cal) default: // Work around for issue 1304: // flush modified globals before each instruction. - for(z=0; z<BITS; z++) + for(z=0; z<BITS; z++) { cal.b[z] |= externs.b[z]; + // issue 4066: flush modified return variables in case of panic + if(hasdefer) + cal.b[z] |= ovar.b[z]; + } break; } for(z=0; z<BITS; z++) { diff --git a/src/cmd/6g/reg.c b/src/cmd/6g/reg.c index 8d15bf9790..9c9b74d0ed 100644 --- a/src/cmd/6g/reg.c +++ b/src/cmd/6g/reg.c @@ -1121,8 +1121,12 @@ prop(Reg *r, Bits ref, Bits cal) default: // Work around for issue 1304: // flush modified globals before each instruction. - for(z=0; z<BITS; z++) + for(z=0; z<BITS; z++) { cal.b[z] |= externs.b[z]; + // issue 4066: flush modified return variables in case of panic + if(hasdefer) + cal.b[z] |= ovar.b[z]; + } break; } for(z=0; z<BITS; z++) { diff --git a/src/cmd/8g/reg.c b/src/cmd/8g/reg.c index 80230bc866..7b8b39e8bc 100644 --- a/src/cmd/8g/reg.c +++ b/src/cmd/8g/reg.c @@ -1048,8 +1048,12 @@ prop(Reg *r, Bits ref, Bits cal) default: // Work around for issue 1304: // flush modified globals before each instruction. - for(z=0; z<BITS; z++) + for(z=0; z<BITS; z++) { cal.b[z] |= externs.b[z]; + // issue 4066: flush modified return variables in case of panic + if(hasdefer) + cal.b[z] |= ovar.b[z]; + } break; } for(z=0; z<BITS; z++) { |