From 6f4b74278025a9b8061df721ab4769ae2ea8f2ff Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 30 Aug 2006 08:33:11 +0000 Subject: [PATCH] FILL_SLOP: don't fill slop for BLACKHOLE/CAF_BLACKHOLE This affects -debug only, avoids crash with test conc012. --- rts/Updates.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rts/Updates.h b/rts/Updates.h index 2456f12..abca788 100644 --- a/rts/Updates.h +++ b/rts/Updates.h @@ -233,6 +233,10 @@ FILL_SLOP(StgClosure *p) switch (inf->type) { case BLACKHOLE: case CAF_BLACKHOLE: + goto no_slop; + // we already filled in the slop when we overwrote the thunk + // with BLACKHOLE, and also an evacuated BLACKHOLE is only the + // size of an IND. case THUNK_SELECTOR: sz = sizeofW(StgSelector) - sizeofW(StgThunkHeader); break; @@ -249,6 +253,8 @@ FILL_SLOP(StgClosure *p) for (i = 0; i < sz; i++) { ((StgThunk *)p)->payload[i] = 0; } +no_slop: + ; } #endif /* CMINUSMINUS */ -- 1.7.10.4