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/CgHeapery.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/CgHeapery.lhs')
| -rw-r--r-- | compiler/codeGen/CgHeapery.lhs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/codeGen/CgHeapery.lhs b/compiler/codeGen/CgHeapery.lhs index 03b5deb058..d8ac298b58 100644 --- a/compiler/codeGen/CgHeapery.lhs +++ b/compiler/codeGen/CgHeapery.lhs @@ -464,7 +464,7 @@ do_checks' stk_expr hp_expr stk_nonzero hp_nonzero reg_save_code rts_lbl -- the appropriate RTS stub. ; exit_blk_id <- forkLabelledCode $ do { ; emitStmts reg_save_code - ; stmtC (CmmJump rts_lbl []) } + ; stmtC (CmmJump rts_lbl) } -- In the case of a heap-check failure, we must also set -- HpAlloc. NB. HpAlloc is *only* set if Hp has been |