Commit a770226e authored by Ben Gamari's avatar Ben Gamari Committed by Ben Gamari
Browse files

Fix regression on i386 due to get/setAllocationCounter change

Reviewers: simonmar, erikd

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4312
parent e20046a0
...@@ -2499,7 +2499,7 @@ stg_traceMarkerzh ( W_ msg ) ...@@ -2499,7 +2499,7 @@ stg_traceMarkerzh ( W_ msg )
stg_getThreadAllocationCounterzh () stg_getThreadAllocationCounterzh ()
{ {
// Account for the allocation in the current block // Account for the allocation in the current block
W_ offset; I64 offset;
offset = Hp - bdescr_start(CurrentNursery); offset = Hp - bdescr_start(CurrentNursery);
return (StgTSO_alloc_limit(CurrentTSO) - offset); return (StgTSO_alloc_limit(CurrentTSO) - offset);
} }
...@@ -2510,7 +2510,7 @@ stg_setThreadAllocationCounterzh ( I64 counter ) ...@@ -2510,7 +2510,7 @@ stg_setThreadAllocationCounterzh ( I64 counter )
// getThreadAllocationCounter#, so we have to offset any existing // getThreadAllocationCounter#, so we have to offset any existing
// allocation here. See also openNursery/closeNursery in // allocation here. See also openNursery/closeNursery in
// compiler/codeGen/StgCmmForeign.hs. // compiler/codeGen/StgCmmForeign.hs.
W_ offset; I64 offset;
offset = Hp - bdescr_start(CurrentNursery); offset = Hp - bdescr_start(CurrentNursery);
StgTSO_alloc_limit(CurrentTSO) = counter + offset; StgTSO_alloc_limit(CurrentTSO) = counter + offset;
return (); return ();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment