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/Exception.cmm | |
| 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/Exception.cmm')
| -rw-r--r-- | rts/Exception.cmm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rts/Exception.cmm b/rts/Exception.cmm index bc55911687..8533e3e35e 100644 --- a/rts/Exception.cmm +++ b/rts/Exception.cmm @@ -13,7 +13,7 @@ #include "Cmm.h" #include "RaiseAsync.h" -import ghczmprim_GHCziTypes_True_closure; +import ghczmprim_GHCziTypes_True_static_closure; /* ----------------------------------------------------------------------------- Exception Primitives @@ -527,8 +527,8 @@ retry_pop_stack: Sp(5) = exception; Sp(4) = stg_raise_ret_info; Sp(3) = exception; // the AP_STACK - Sp(2) = ghczmprim_GHCziTypes_True_closure; // dummy breakpoint info - Sp(1) = ghczmprim_GHCziTypes_True_closure; // True <=> a breakpoint + Sp(2) = STATIC_CLOSURE(ghczmprim_GHCziTypes_True); // dummy breakpoint info + Sp(1) = STATIC_CLOSURE(ghczmprim_GHCziTypes_True); // True <=> a breakpoint R1 = ioAction; jump RET_LBL(stg_ap_pppv) [R1]; } |