diff options
author | Ömer Sinan Ağacan <omeragacan@gmail.com> | 2016-08-05 18:52:46 +0000 |
---|---|---|
committer | Ömer Sinan Ağacan <omeragacan@gmail.com> | 2016-08-05 18:52:46 +0000 |
commit | 7354f93c8158b699c7fc1e7592e5826c1b9a22d9 (patch) | |
tree | 12de7916ca4cdfdc758107715ef32fc82b1f85fc /compiler/codeGen | |
parent | 253fc3888dc170feb8adcd05067020a2ee1ea53e (diff) | |
download | haskell-7354f93c8158b699c7fc1e7592e5826c1b9a22d9.tar.gz |
StgCmm: Remove unused Bool field of Return sequel
Diffstat (limited to 'compiler/codeGen')
-rw-r--r-- | compiler/codeGen/StgCmmExpr.hs | 2 | ||||
-rw-r--r-- | compiler/codeGen/StgCmmLayout.hs | 4 | ||||
-rw-r--r-- | compiler/codeGen/StgCmmMonad.hs | 7 |
3 files changed, 6 insertions, 7 deletions
diff --git a/compiler/codeGen/StgCmmExpr.hs b/compiler/codeGen/StgCmmExpr.hs index 1965754399..005e332d07 100644 --- a/compiler/codeGen/StgCmmExpr.hs +++ b/compiler/codeGen/StgCmmExpr.hs @@ -854,7 +854,7 @@ emitEnter fun = do -- -- Right now, we do what the old codegen did, and omit the tag -- test, just generating an enter. - Return _ -> do + Return -> do { let entry = entryCode dflags $ closureInfoPtr dflags $ CmmReg nodeReg ; emit $ mkJump dflags NativeNodeCall entry [CmmExprArg (cmmUntag dflags fun)] updfr_off diff --git a/compiler/codeGen/StgCmmLayout.hs b/compiler/codeGen/StgCmmLayout.hs index 713d542bdc..39f3cd7fa3 100644 --- a/compiler/codeGen/StgCmmLayout.hs +++ b/compiler/codeGen/StgCmmLayout.hs @@ -74,7 +74,7 @@ emitReturn results ; sequel <- getSequel ; updfr_off <- getUpdFrameOff ; case sequel of - Return _ -> + Return -> do { adjustHpBackwards ; let e = CmmLoad (CmmStackSlot Old updfr_off) (gcWord dflags) ; emit (mkReturn dflags (entryCode dflags e) results updfr_off) @@ -109,7 +109,7 @@ emitCallWithExtraStack (callConv, retConv) fun args extra_stack ; sequel <- getSequel ; updfr_off <- getUpdFrameOff ; case sequel of - Return _ -> do + Return -> do emit $ mkJumpExtra dflags callConv fun args updfr_off extra_stack return AssignedDirectly AssignTo res_regs _ -> do diff --git a/compiler/codeGen/StgCmmMonad.hs b/compiler/codeGen/StgCmmMonad.hs index 8f66cfaa91..471a94df64 100644 --- a/compiler/codeGen/StgCmmMonad.hs +++ b/compiler/codeGen/StgCmmMonad.hs @@ -219,8 +219,7 @@ instance Outputable CgIdInfo where -- Sequel tells what to do with the result of this expression data Sequel - = Return Bool -- Return result(s) to continuation found on the stack. - -- True <=> the continuation is update code (???) + = Return -- Return result(s) to continuation found on the stack. | AssignTo [LocalReg] -- Put result(s) in these regs and fall through @@ -233,7 +232,7 @@ data Sequel -- allocating primOp) instance Outputable Sequel where - ppr (Return b) = text "Return" <+> ppr b + ppr Return = text "Return" ppr (AssignTo regs b) = text "AssignTo" <+> ppr regs <+> ppr b -- See Note [sharing continuations] below @@ -320,7 +319,7 @@ initCgInfoDown dflags mod , cgd_tick_scope= GlobalScope } initSequel :: Sequel -initSequel = Return False +initSequel = Return initUpdFrameOff :: DynFlags -> UpdFrameOffset initUpdFrameOff dflags = widthInBytes (wordWidth dflags) -- space for the RA |