diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-10-20 15:57:13 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-10-20 16:28:42 -0700 |
| commit | 89a8d817f0c2951ec305c286a526205d06bf9221 (patch) | |
| tree | 5295cab951600148bd83f1cae0ae5250816dc257 /rts/STM.c | |
| parent | 0202b7cefbaf76dc53d43562dbc84a52debe2eb2 (diff) | |
| download | haskell-89a8d817f0c2951ec305c286a526205d06bf9221.tar.gz | |
Revert "Rename _closure to _static_closure, apply naming consistently."
This reverts commit 35672072b4091d6f0031417bc160c568f22d0469.
Conflicts:
compiler/main/DriverPipeline.hs
Diffstat (limited to 'rts/STM.c')
| -rw-r--r-- | rts/STM.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -386,11 +386,11 @@ static void unpark_tso(Capability *cap, StgTSO *tso) { // future. lockTSO(tso); if (tso->why_blocked == BlockedOnSTM && - tso->block_info.closure == stg_STM_AWOKEN_closure) { + tso->block_info.closure == &stg_STM_AWOKEN_closure) { TRACE("unpark_tso already woken up tso=%p", tso); } else if (tso -> why_blocked == BlockedOnSTM) { TRACE("unpark_tso on tso=%p", tso); - tso->block_info.closure = stg_STM_AWOKEN_closure; + tso->block_info.closure = &stg_STM_AWOKEN_closure; tryWakeupThread(cap,tso); } else { TRACE("spurious unpark_tso on tso=%p", tso); |