diff --git a/ghc/compiler/codeGen/CgCase.lhs b/ghc/compiler/codeGen/CgCase.lhs index e5a7adf2003e9d6fec3a04bbe9f40810a529f19e..305a28332d3b669f3eefe2c9de686c6ebeab93d2 100644 --- a/ghc/compiler/codeGen/CgCase.lhs +++ b/ghc/compiler/codeGen/CgCase.lhs @@ -248,7 +248,7 @@ cgCase (StgPrim op args _) live_in_whole_case live_in_alts uniq alts -- on as the first "argument" -- ToDo: un-duplicate? - pin_liveness (CCallOp _ _ _ _ _) _ args = args + pin_liveness (CCallOp _ _ _ _ _ _) _ args = args pin_liveness other_op liveness_arg args = liveness_arg :args diff --git a/ghc/compiler/codeGen/CgCon.lhs b/ghc/compiler/codeGen/CgCon.lhs index bfabcf774f0671b4eb20fc881d83cb68d9c389ad..ea44e5cece59e2403162211a8cdb7cee20d380c7 100644 --- a/ghc/compiler/codeGen/CgCon.lhs +++ b/ghc/compiler/codeGen/CgCon.lhs @@ -303,7 +303,8 @@ buildDynCon binder cc con [arg_amode] all_zero_size_args@False where (temp_amode, temp_id_info) = newTempAmodeAndIdInfo binder (mkConLFInfo con) - in_range_int_lit (CLit (MachInt val _)) = val <= mAX_INTLIKE && val >= mIN_INTLIKE + in_range_int_lit (CLit (MachInt val _)) = val <= mAX_INTLIKE && + val >= mIN_INTLIKE in_range_int_lit other_amode = False \end{code} diff --git a/ghc/compiler/codeGen/CgExpr.lhs b/ghc/compiler/codeGen/CgExpr.lhs index 904dd5504e47b8e8e697f8d2f34b718e0afcea43..0fa89666f2a9df7f97b94579551632bc98de7a06 100644 --- a/ghc/compiler/codeGen/CgExpr.lhs +++ b/ghc/compiler/codeGen/CgExpr.lhs @@ -195,7 +195,7 @@ cgExpr x@(StgPrim op args live_vars) -- on as the first "argument" -- ToDo: un-duplicate? - pin_liveness (CCallOp _ _ _ _ _) _ args = args + pin_liveness (CCallOp _ _ _ _ _ _) _ args = args pin_liveness other_op liveness_arg args = liveness_arg :args diff --git a/ghc/compiler/codeGen/CgTailCall.lhs b/ghc/compiler/codeGen/CgTailCall.lhs index fb09a0e96b4555787cbddff4a556afd508d1e123..abf287e63982c8e03ec67cd4c5d0530400d9fc11 100644 --- a/ghc/compiler/codeGen/CgTailCall.lhs +++ b/ghc/compiler/codeGen/CgTailCall.lhs @@ -436,7 +436,7 @@ tailCallBusiness fun fun_amode lf_info arg_amodes live_vars pending_assts = load_regs_and_profiling_code `mkAbsCStmts` CJump (CLbl join_lbl CodePtrRep) - semi_tagged_alts = [ (mkMachInt (toInteger (tag - fIRST_TAG)), + semi_tagged_alts = [ (mkMachInt (fromInt (tag - fIRST_TAG)), join_details_to_code join_details) | (tag, join_details) <- st_alts ]