diff options
| author | Edward Z. Yang <ezyang@mit.edu> | 2013-08-26 15:23:15 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-10-01 22:26:39 -0700 |
| commit | 35672072b4091d6f0031417bc160c568f22d0469 (patch) | |
| tree | 243925bae6f8869cca1df8595c17c0467b9d5998 /rts/RaiseAsync.c | |
| parent | 178eb9060f369b216f3f401196e28eab4af5624d (diff) | |
| download | haskell-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/RaiseAsync.c')
| -rw-r--r-- | rts/RaiseAsync.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rts/RaiseAsync.c b/rts/RaiseAsync.c index a5440e40ad..8485e4804a 100644 --- a/rts/RaiseAsync.c +++ b/rts/RaiseAsync.c @@ -776,7 +776,7 @@ raiseAsync(Capability *cap, StgTSO *tso, StgClosure *exception, sp++; } else { sp--; - sp[0] = (W_)&stg_dummy_ret_closure; + sp[0] = (W_)stg_dummy_ret_closure; } frame = sp + 1; @@ -957,7 +957,7 @@ raiseAsync(Capability *cap, StgTSO *tso, StgClosure *exception, // ATOMICALLY_FRAME instance for condemned // transactions, but I don't fully understand the // interaction with STM invariants. - stack->sp[1] = (W_)&stg_NO_TREC_closure; + stack->sp[1] = (W_)stg_NO_TREC_closure; stack->sp[0] = (W_)&stg_ret_p_info; tso->what_next = ThreadRunGHC; goto done; |