diff options
| author | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:22:53 +0200 |
|---|---|---|
| committer | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:22:53 +0200 |
| commit | 8a39ee361feb9bf46d728ff1ba4f07ca1d9610b1 (patch) | |
| tree | 4449f2036cccf162e8417cc5841a35815b3e7ac5 /src/pkg/runtime/callback_windows.c | |
| parent | c8bf49ef8a92e2337b69c14b9b88396efe498600 (diff) | |
| download | golang-upstream/1.3.tar.gz | |
Imported Upstream version 1.3upstream/1.3
Diffstat (limited to 'src/pkg/runtime/callback_windows.c')
| -rw-r--r-- | src/pkg/runtime/callback_windows.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/pkg/runtime/callback_windows.c b/src/pkg/runtime/callback_windows.c index 88ee53bb5..285678fba 100644 --- a/src/pkg/runtime/callback_windows.c +++ b/src/pkg/runtime/callback_windows.c @@ -49,7 +49,7 @@ runtime·compilecallback(Eface fn, bool cleanstack) runtime·cbctxts = &(cbs.ctxt[0]); n = cbs.n; for(i=0; i<n; i++) { - if(cbs.ctxt[i]->gobody == fn.data) { + if(cbs.ctxt[i]->gobody == fn.data && cbs.ctxt[i]->cleanstack == cleanstack) { runtime·unlock(&cbs); // runtime·callbackasm is just a series of CALL instructions // (each is 5 bytes long), and we want callback to arrive at @@ -63,6 +63,7 @@ runtime·compilecallback(Eface fn, bool cleanstack) c = runtime·mal(sizeof *c); c->gobody = fn.data; c->argsize = argsize; + c->cleanstack = cleanstack; if(cleanstack && argsize!=0) c->restorestack = argsize; else |