diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-07-04 13:19:26 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-07-04 13:19:47 +0100 |
| commit | 3f0afabaf3e862d986279dc041b14b61e73f86d3 (patch) | |
| tree | 30b0a2dabcdbf01688040ea28128292970dc4085 /compiler/codeGen | |
| parent | 99fd2469fba1a38b2a65b4694f337d92e559df01 (diff) | |
| download | haskell-3f0afabaf3e862d986279dc041b14b61e73f86d3.tar.gz | |
Fix merge-related problems
Diffstat (limited to 'compiler/codeGen')
| -rw-r--r-- | compiler/codeGen/CodeGen.lhs | 3 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmHeap.hs | 2 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmUtils.hs | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/compiler/codeGen/CodeGen.lhs b/compiler/codeGen/CodeGen.lhs index 9c936d3281..c9b2bf8ab0 100644 --- a/compiler/codeGen/CodeGen.lhs +++ b/compiler/codeGen/CodeGen.lhs @@ -30,7 +30,7 @@ import CgHpc import CLabel import OldCmm -import OldPprCmm +import OldPprCmm () import StgSyn import PrelNames @@ -46,6 +46,7 @@ import Module import ErrUtils import Panic import Outputable +import Util import OrdList import Stream (Stream, liftIO) diff --git a/compiler/codeGen/StgCmmHeap.hs b/compiler/codeGen/StgCmmHeap.hs index 856b04367d..611304b5e0 100644 --- a/compiler/codeGen/StgCmmHeap.hs +++ b/compiler/codeGen/StgCmmHeap.hs @@ -338,7 +338,7 @@ entryHeapCheck cl_info offset nodeSet arity args code args' = map (CmmReg . CmmLocal) args setN = case nodeSet of - Just n -> mkNop -- No need to assign R1, it already + Just _ -> mkNop -- No need to assign R1, it already -- points to the closure Nothing -> mkAssign nodeReg $ CmmLit (CmmLabel $ staticClosureLabel cl_info) diff --git a/compiler/codeGen/StgCmmUtils.hs b/compiler/codeGen/StgCmmUtils.hs index 7609cfe38d..273e59b0b5 100644 --- a/compiler/codeGen/StgCmmUtils.hs +++ b/compiler/codeGen/StgCmmUtils.hs @@ -575,8 +575,8 @@ mkCmmSwitch via_C tag_expr branches mb_deflt lo_tag hi_tag = do branches_lbls <- label_branches join_lbl branches tag_expr' <- assignTemp' tag_expr - emit =<< mk_switch tag_expr' (sortBy (comparing fst) branches) mb_deflt_lbl - lo_tag hi_tag via_C + emit =<< mk_switch tag_expr' (sortBy (comparing fst) branches_lbls) + mb_deflt_lbl lo_tag hi_tag via_C -- Sort the branches before calling mk_switch |