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/PrimOps.cmm | |
| 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/PrimOps.cmm')
| -rw-r--r-- | rts/PrimOps.cmm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm index a0e744b1ba..16c91e9b3a 100644 --- a/rts/PrimOps.cmm +++ b/rts/PrimOps.cmm @@ -31,7 +31,7 @@ import pthread_mutex_unlock; import base_ControlziExceptionziBase_nestedAtomically_static_closure; import EnterCriticalSection; import LeaveCriticalSection; -import ghczmprim_GHCziTypes_False_static_closure; +import ghczmprim_GHCziTypes_False_closure; #if defined(USE_MINIINTERPRETER) || !defined(mingw32_HOST_OS) import sm_mutex; #endif @@ -1171,7 +1171,7 @@ stg_atomicallyzh (P_ stm) /* Nested transactions are not allowed; raise an exception */ if (old_trec != NO_TREC) { - jump stg_raisezh(STATIC_CLOSURE(base_ControlziExceptionziBase_nestedAtomically)); + jump stg_raisezh(base_ControlziExceptionziBase_nestedAtomically_closure); } code = stm; @@ -2342,13 +2342,13 @@ stg_getSparkzh () W_ spark; #ifndef THREADED_RTS - return (0,STATIC_CLOSURE(ghczmprim_GHCziTypes_False)); + return (0,ghczmprim_GHCziTypes_False_closure); #else (spark) = ccall findSpark(MyCapability()); if (spark != 0) { return (1,spark); } else { - return (0,STATIC_CLOSURE(ghczmprim_GHCziTypes_False)); + return (0,ghczmprim_GHCziTypes_False_closure); } #endif } |