diff options
| author | simonmar@microsoft.com <unknown> | 2008-02-28 15:23:32 +0000 |
|---|---|---|
| committer | simonmar@microsoft.com <unknown> | 2008-02-28 15:23:32 +0000 |
| commit | 65bb9b5ae78ee29100ea6bf5617b0fdbc0a100bd (patch) | |
| tree | 83ee93ebf3227e25714f353fb073a8789f28d666 /rts/Updates.h | |
| parent | 9b0be04d7d23a4ccce0275f3a7c519d9b614f3a2 (diff) | |
| download | haskell-65bb9b5ae78ee29100ea6bf5617b0fdbc0a100bd.tar.gz | |
Updating a thunk in raiseAsync might encounter an IND; cope
There was already a check to avoid updating an IND, but it was
originally there to avoid a bug which doesn't exist now. Furthermore
the test and update are not atomic, so another thread could be
updating this thunk while we are. We have to just go ahead and update
anyway - it might waste a little work, but this is a very rare case.
Diffstat (limited to 'rts/Updates.h')
| -rw-r--r-- | rts/Updates.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rts/Updates.h b/rts/Updates.h index 3461c91144..c04005b49b 100644 --- a/rts/Updates.h +++ b/rts/Updates.h @@ -280,8 +280,9 @@ no_slop: { \ bdescr *bd; \ \ - /* cas(p1, 0, &stg_WHITEHOLE_info); */ \ - ASSERT( (P_)p1 != (P_)p2 && !closure_IND(p1) ); \ + ASSERT( (P_)p1 != (P_)p2 ); \ + /* not necessarily true: ASSERT( !closure_IND(p1) ); */ \ + /* occurs in RaiseAsync.c:raiseAsync() */ \ DEBUG_FILL_SLOP(p1); \ LDV_RECORD_DEAD_FILL_SLOP_DYNAMIC(p1); \ ((StgInd *)p1)->indirectee = p2; \ |