diff options
| author | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2012-01-07 13:56:17 -0800 |
|---|---|---|
| committer | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2012-01-07 13:56:17 -0800 |
| commit | f784eb7585901e2297d504dcf777ebc58d60aaa5 (patch) | |
| tree | 7bf8bc625882724f5db96121c327ee3e80ae781a /compiler/codeGen/CgTailCall.lhs | |
| parent | 7655c718d56666a918c06f6d4e32d98482620b9c (diff) | |
| parent | a5b365ac3ea7277817541f8bc3341eecfb083490 (diff) | |
| download | haskell-f784eb7585901e2297d504dcf777ebc58d60aaa5.tar.gz | |
Merge remote-tracking branch 'origin/master' into type-nats
Diffstat (limited to 'compiler/codeGen/CgTailCall.lhs')
| -rw-r--r-- | compiler/codeGen/CgTailCall.lhs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/codeGen/CgTailCall.lhs b/compiler/codeGen/CgTailCall.lhs index fb8f854c0b..07be7f23fa 100644 --- a/compiler/codeGen/CgTailCall.lhs +++ b/compiler/codeGen/CgTailCall.lhs @@ -123,7 +123,7 @@ performTailCall fun_info arg_amodes pending_assts EnterIt -> do { emitSimultaneously (node_asst `plusStmts` pending_assts) ; let target = entryCode (closureInfoPtr (CmmReg nodeReg)) - enterClosure = stmtC (CmmJump target []) + enterClosure = stmtC (CmmJump target) -- If this is a scrutinee -- let's check if the closure is a constructor -- so we can directly jump to the alternatives switch @@ -203,7 +203,7 @@ performTailCall fun_info arg_amodes pending_assts -- No, enter the closure. ; enterClosure ; labelC is_constr - ; stmtC (CmmJump (entryCode $ CmmLit (CmmLabel lbl)) []) + ; stmtC (CmmJump (entryCode $ CmmLit (CmmLabel lbl))) } {- -- This is a scrutinee for a case expression @@ -218,7 +218,7 @@ performTailCall fun_info arg_amodes pending_assts ; stmtC (CmmCondBranch (cond1 tag) no_cons) ; stmtC (CmmCondBranch (cond2 tag) no_cons) -- Yes, jump to switch statement - ; stmtC (CmmJump (CmmLit (CmmLabel lbl)) []) + ; stmtC (CmmJump (CmmLit (CmmLabel lbl))) ; labelC no_cons -- No, enter the closure. ; enterClosure @@ -438,9 +438,9 @@ pushReturnAddress _ = nopC -- ----------------------------------------------------------------------------- -- Misc. -jumpToLbl :: CLabel -> Code -- Passes no argument to the destination procedure -jumpToLbl lbl = stmtC (CmmJump (CmmLit (CmmLabel lbl)) [{- No args -}]) +jumpToLbl :: CLabel -> Code +jumpToLbl lbl = stmtC (CmmJump (CmmLit (CmmLabel lbl))) assignToRegs :: [(CmmExpr, GlobalReg)] -> CmmStmts assignToRegs reg_args |