[commit: ghc] master: Add a missing untag to the non-updatable selector thunks (#7978) (a27895b)

git at git.haskell.org git at git.haskell.org
Tue Aug 13 14:00:27 CEST 2013


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a27895b359db20197d9ec72b03c4e304a20585d8/ghc

>---------------------------------------------------------------

commit a27895b359db20197d9ec72b03c4e304a20585d8
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Tue Aug 13 12:06:03 2013 +0100

    Add a missing untag to the non-updatable selector thunks (#7978)


>---------------------------------------------------------------

a27895b359db20197d9ec72b03c4e304a20585d8
 rts/StgStdThunks.cmm |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rts/StgStdThunks.cmm b/rts/StgStdThunks.cmm
index 53e4cb1..979f749 100644
--- a/rts/StgStdThunks.cmm
+++ b/rts/StgStdThunks.cmm
@@ -111,10 +111,10 @@ SELECTOR_CODE_UPD(15)
       UPD_BH_UPDATABLE(node);                                           \
       LDV_ENTER(node);                                                  \
       selectee = StgThunk_payload(node,0);                              \
+      ENTER_CCS_THUNK(node);                                            \
       if (NEED_EVAL(selectee)) {                                        \
-          ENTER_CCS_THUNK(node);                                        \
           SAVE_CCS;                                                     \
-          (P_ constr) = call %GET_ENTRY(selectee) (selectee);           \
+          (P_ constr) = call %GET_ENTRY(UNTAG_IF_PROF(selectee)) (selectee);           \
           RESTORE_CCS;                                                  \
           selectee = constr;                                            \
       }                                                                 \





More information about the ghc-commits mailing list