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/Weak.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/Weak.c')
| -rw-r--r-- | rts/Weak.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rts/Weak.c b/rts/Weak.c index 3890dfb2d2..f8faa4e1f5 100644 --- a/rts/Weak.c +++ b/rts/Weak.c @@ -21,7 +21,7 @@ runCFinalizers(StgCFinalizerList *list) { StgCFinalizerList *head; for (head = list; - (StgClosure *)head != stg_NO_FINALIZER_closure; + (StgClosure *)head != &stg_NO_FINALIZER_closure; head = (StgCFinalizerList *)head->link) { if (head->flag) @@ -88,7 +88,7 @@ scheduleFinalizers(Capability *cap, StgWeak *list) // collector removes DEAD_WEAKs from the weak pointer list. ASSERT(w->header.info != &stg_DEAD_WEAK_info); - if (w->finalizer != stg_NO_FINALIZER_closure) { + if (w->finalizer != &stg_NO_FINALIZER_closure) { n++; } @@ -124,7 +124,7 @@ scheduleFinalizers(Capability *cap, StgWeak *list) n = 0; for (w = list; w; w = w->link) { - if (w->finalizer != stg_NO_FINALIZER_closure) { + if (w->finalizer != &stg_NO_FINALIZER_closure) { arr->payload[n] = w->finalizer; n++; } |