diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-08-02 15:20:44 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-08-06 09:47:32 +0100 |
| commit | 6228e318eabcba88c289d48287abc224fa57901d (patch) | |
| tree | 240f63628f849643da0d3d8dafceeb052f8cb38c /compiler/codeGen/StgCmm.hs | |
| parent | 290ec750343a340d5f2cef8bf844f3822c9629e0 (diff) | |
| download | haskell-6228e318eabcba88c289d48287abc224fa57901d.tar.gz | |
Use "ReturnedTo" when generating safe foreign calls
Diffstat (limited to 'compiler/codeGen/StgCmm.hs')
| -rw-r--r-- | compiler/codeGen/StgCmm.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/codeGen/StgCmm.hs b/compiler/codeGen/StgCmm.hs index d82b4bc3b1..d8127ab737 100644 --- a/compiler/codeGen/StgCmm.hs +++ b/compiler/codeGen/StgCmm.hs @@ -52,7 +52,7 @@ import OrdList import MkGraph import Data.IORef -import Control.Monad (when) +import Control.Monad (when,void) import Util codeGen :: DynFlags @@ -244,9 +244,9 @@ cgDataCon data_con do { _ <- ticky_code ; ldvEnter (CmmReg nodeReg) ; tickyReturnOldCon (length arg_things) - ; _ <- emitReturn [cmmOffsetB (CmmReg nodeReg) + ; void $ emitReturn [cmmOffsetB (CmmReg nodeReg) (tagForCon data_con)] - ; return () } + } -- The case continuation code expects a tagged pointer arg_reps :: [(PrimRep, UnaryType)] |