diff options
| author | Ben Gamari <bgamari.foss@gmail.com> | 2018-01-15 13:01:59 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-01-15 13:53:45 -0500 |
| commit | a770226e03f09b767fdb4ce826162a5c0f29ec29 (patch) | |
| tree | 9c224b00a5bb62919c1fc5b56e77e724a4ec967e /rts/PrimOps.cmm | |
| parent | e20046a0c4a552c5037797cf720fb34877bc2d21 (diff) | |
| download | haskell-a770226e03f09b767fdb4ce826162a5c0f29ec29.tar.gz | |
Fix regression on i386 due to get/setAllocationCounter change
Reviewers: simonmar, erikd
Subscribers: rwbarton, thomie, carter
Differential Revision: https://phabricator.haskell.org/D4312
Diffstat (limited to 'rts/PrimOps.cmm')
| -rw-r--r-- | rts/PrimOps.cmm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm index 1caa0c3343..42001d10b5 100644 --- a/rts/PrimOps.cmm +++ b/rts/PrimOps.cmm @@ -2499,7 +2499,7 @@ stg_traceMarkerzh ( W_ msg ) stg_getThreadAllocationCounterzh () { // Account for the allocation in the current block - W_ offset; + I64 offset; offset = Hp - bdescr_start(CurrentNursery); return (StgTSO_alloc_limit(CurrentTSO) - offset); } @@ -2510,7 +2510,7 @@ stg_setThreadAllocationCounterzh ( I64 counter ) // getThreadAllocationCounter#, so we have to offset any existing // allocation here. See also openNursery/closeNursery in // compiler/codeGen/StgCmmForeign.hs. - W_ offset; + I64 offset; offset = Hp - bdescr_start(CurrentNursery); StgTSO_alloc_limit(CurrentTSO) = counter + offset; return (); |