summaryrefslogtreecommitdiff
path: root/compiler/codeGen/CgCon.lhs
diff options
context:
space:
mode:
authorIavor S. Diatchki <iavor.diatchki@gmail.com>2012-01-07 13:56:17 -0800
committerIavor S. Diatchki <iavor.diatchki@gmail.com>2012-01-07 13:56:17 -0800
commitf784eb7585901e2297d504dcf777ebc58d60aaa5 (patch)
tree7bf8bc625882724f5db96121c327ee3e80ae781a /compiler/codeGen/CgCon.lhs
parent7655c718d56666a918c06f6d4e32d98482620b9c (diff)
parenta5b365ac3ea7277817541f8bc3341eecfb083490 (diff)
downloadhaskell-f784eb7585901e2297d504dcf777ebc58d60aaa5.tar.gz
Merge remote-tracking branch 'origin/master' into type-nats
Diffstat (limited to 'compiler/codeGen/CgCon.lhs')
-rw-r--r--compiler/codeGen/CgCon.lhs4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/codeGen/CgCon.lhs b/compiler/codeGen/CgCon.lhs
index 17bb9d0ad8..99690945cb 100644
--- a/compiler/codeGen/CgCon.lhs
+++ b/compiler/codeGen/CgCon.lhs
@@ -352,8 +352,8 @@ cgReturnDataCon con amodes
}
where
enter_it = stmtsC [ CmmAssign nodeReg (cmmUntag (CmmReg nodeReg)),
- CmmJump (entryCode (closureInfoPtr (CmmReg nodeReg))) [] ]
- jump_to lbl = stmtC (CmmJump (CmmLit lbl) [])
+ CmmJump (entryCode (closureInfoPtr (CmmReg nodeReg)))]
+ jump_to lbl = stmtC (CmmJump (CmmLit lbl))
build_it_then return_code
= do { -- BUILD THE OBJECT IN THE HEAP
-- The first "con" says that the name bound to this