diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-05-18 06:33:03 +1000 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-05-18 06:33:03 +1000 |
| commit | 33c029dd77888ee5f9b1c7ce8884c982e0428adf (patch) | |
| tree | 6c38a3f4c4dcc2fb20a8ce4a1c9d1dc520ec6f9d /rts/Schedule.c | |
| parent | 5d80d14196ef048ffe037b2d92af2e9af0cb9e19 (diff) | |
| download | haskell-33c029dd77888ee5f9b1c7ce8884c982e0428adf.tar.gz | |
rts: More const correct-ness fixes
In addition to more const-correctness fixes this patch fixes an
infelicity of the previous const-correctness patch (995cf0f356) which
left `UNTAG_CLOSURE` taking a `const StgClosure` pointer parameter
but returning a non-const pointer. Here we restore the original type
signature of `UNTAG_CLOSURE` and add a new function
`UNTAG_CONST_CLOSURE` which takes and returns a const `StgClosure`
pointer and uses that wherever possible.
Test Plan: Validate on Linux, OS X and Windows
Reviewers: Phyx, hsyl20, bgamari, austin, simonmar, trofi
Reviewed By: simonmar, trofi
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2231
Diffstat (limited to 'rts/Schedule.c')
| -rw-r--r-- | rts/Schedule.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rts/Schedule.c b/rts/Schedule.c index 0db9ff8e9b..8a08e35cc3 100644 --- a/rts/Schedule.c +++ b/rts/Schedule.c @@ -2790,7 +2790,7 @@ raiseExceptionHelper (StgRegTable *reg, StgTSO *tso, StgClosure *exception) Capability *cap = regTableToCapability(reg); StgThunk *raise_closure = NULL; StgPtr p, next; - StgRetInfoTable *info; + const StgRetInfoTable *info; // // This closure represents the expression 'raise# E' where E // is the exception raise. It is used to overwrite all the @@ -2899,12 +2899,12 @@ raiseExceptionHelper (StgRegTable *reg, StgTSO *tso, StgClosure *exception) StgWord findRetryFrameHelper (Capability *cap, StgTSO *tso) { - StgPtr p, next; - StgRetInfoTable *info; + const StgRetInfoTable *info; + StgPtr p, next; p = tso->stackobj->sp; while (1) { - info = get_ret_itbl((StgClosure *)p); + info = get_ret_itbl((const StgClosure *)p); next = p + stack_frame_sizeW((StgClosure *)p); switch (info->i.type) { |