From de7f220342bf4d2a308ed106f34760ee99d832ab Mon Sep 17 00:00:00 2001
From: GHC GitLab CI <ghc-ci@gitlab-haskell.org>
Date: Thu, 26 Nov 2020 01:01:18 +0000
Subject: [PATCH] Updates: Don't zero slop until closure has been pushed
Ensure that the the free variables have been pushed to the update
remembered set before we zero the slop.
(cherry picked from commit 134f759926bb4163d7ab97e72ce7209ed42f98b9)
---
rts/Updates.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rts/Updates.h b/rts/Updates.h
index aa5fbe013329..f2ca437dfcbf 100644
--- a/rts/Updates.h
+++ b/rts/Updates.h
@@ -49,7 +49,6 @@
W_ bd; \
\
prim_write_barrier; \
- OVERWRITING_CLOSURE(p1); \
bd = Bdescr(p1); \
if (bdescr_gen_no(bd) != 0 :: bits16) { \
IF_NONMOVING_WRITE_BARRIER_ENABLED { \
@@ -60,6 +59,7 @@
} else { \
TICK_UPD_NEW_IND(); \
} \
+ OVERWRITING_CLOSURE(p1); \
StgInd_indirectee(p1) = p2; \
prim_write_barrier; \
SET_INFO(p1, stg_BLACKHOLE_info); \
--
GitLab