summaryrefslogtreecommitdiff
path: root/rts/Weak.c
diff options
context:
space:
mode:
authorEdward Z. Yang <ezyang@mit.edu>2013-08-26 15:23:15 -0700
committerEdward Z. Yang <ezyang@cs.stanford.edu>2014-10-01 22:26:39 -0700
commit35672072b4091d6f0031417bc160c568f22d0469 (patch)
tree243925bae6f8869cca1df8595c17c0467b9d5998 /rts/Weak.c
parent178eb9060f369b216f3f401196e28eab4af5624d (diff)
downloadhaskell-35672072b4091d6f0031417bc160c568f22d0469.tar.gz
Rename _closure to _static_closure, apply naming consistently.
Summary: In preparation for indirecting all references to closures, we rename _closure to _static_closure to ensure any old code will get an undefined symbol error. In order to reference a closure foobar_closure (which is now undefined), you should instead use STATIC_CLOSURE(foobar). For convenience, a number of these old identifiers are macro'd. Across C-- and C (Windows and otherwise), there were differing conventions on whether or not foobar_closure or &foobar_closure was the address of the closure. Now, all foobar_closure references are addresses, and no & is necessary. CHARLIKE/INTLIKE were not changed, simply alpha-renamed. Part of remove HEAP_ALLOCED patch set (#8199) Depends on D265 Signed-off-by: Edward Z. Yang <ezyang@mit.edu> Test Plan: validate Reviewers: simonmar, austin Subscribers: simonmar, ezyang, carter, thomie Differential Revision: https://phabricator.haskell.org/D267 GHC Trac Issues: #8199
Diffstat (limited to 'rts/Weak.c')
-rw-r--r--rts/Weak.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/rts/Weak.c b/rts/Weak.c
index f8faa4e1f5..3890dfb2d2 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++;
}