diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2009-08-30 15:31:23 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2009-08-30 15:31:23 +0000 |
| commit | a916885ce70142ae5c05cc9e28230c308821e3d6 (patch) | |
| tree | 6a47be14ef0f0dfeca9dab097a5a2d09780c8ff0 /rts/Prelude.h | |
| parent | 90d1deddda8123c46c4d029439591075ff310fb4 (diff) | |
| download | haskell-a916885ce70142ae5c05cc9e28230c308821e3d6.tar.gz | |
Handle renames from #3310
Also add a panic for resurrecting a thread blocked on an exception,
since it should never happen.
Diffstat (limited to 'rts/Prelude.h')
| -rw-r--r-- | rts/Prelude.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rts/Prelude.h b/rts/Prelude.h index b27fa2708f..3d5101fce6 100644 --- a/rts/Prelude.h +++ b/rts/Prelude.h @@ -37,8 +37,8 @@ extern StgClosure ZCMain_main_closure; PRELUDE_CLOSURE(base_GHCziIOziException_stackOverflow_closure); PRELUDE_CLOSURE(base_GHCziIOziException_heapOverflow_closure); -PRELUDE_CLOSURE(base_GHCziIOziException_blockedOnDeadMVar_closure); -PRELUDE_CLOSURE(base_GHCziIOziException_blockedIndefinitely_closure); +PRELUDE_CLOSURE(base_GHCziIOziException_blockedIndefinitelyOnMVar_closure); +PRELUDE_CLOSURE(base_GHCziIOziException_blockedIndefinitelyOnSTM_closure); PRELUDE_CLOSURE(base_ControlziExceptionziBase_nonTermination_closure); PRELUDE_CLOSURE(base_ControlziExceptionziBase_nestedAtomically_closure); @@ -89,8 +89,8 @@ PRELUDE_INFO(base_GHCziStable_StablePtr_con_info); #define stackOverflow_closure DLL_IMPORT_DATA_REF(base_GHCziIOziException_stackOverflow_closure) #define heapOverflow_closure DLL_IMPORT_DATA_REF(base_GHCziIOziException_heapOverflow_closure) -#define blockedOnDeadMVar_closure DLL_IMPORT_DATA_REF(base_GHCziIOziException_blockedOnDeadMVar_closure) -#define blockedIndefinitely_closure DLL_IMPORT_DATA_REF(base_GHCziIOziException_blockedIndefinitely_closure) +#define blockedIndefinitelyOnMVar_closure DLL_IMPORT_DATA_REF(base_GHCziIOziException_blockedIndefinitelyOnMVar_closure) +#define blockedIndefinitelyOnSTM_closure DLL_IMPORT_DATA_REF(base_GHCziIOziException_blockedIndefinitelyOnSTM_closure) #define nonTermination_closure DLL_IMPORT_DATA_REF(base_ControlziExceptionziBase_nonTermination_closure) #define nestedAtomically_closure DLL_IMPORT_DATA_REF(base_ControlziExceptionziBase_nestedAtomically_closure) |