2015-02-04 00:34:08 +01:00
|
|
|
diff --git a/compiler/codeGen/CgInfoTbls.hs b/compiler/codeGen/CgInfoTbls.hs
|
|
|
|
|
index f704a69..37753fd 100644
|
|
|
|
|
--- a/compiler/codeGen/CgInfoTbls.hs
|
|
|
|
|
+++ b/compiler/codeGen/CgInfoTbls.hs
|
|
|
|
|
@@ -211,9 +211,7 @@ mkStackLayout = do
|
|
|
|
|
[(offset - frame_sp - retAddrSizeW, b)
|
|
|
|
|
| (offset, b) <- binds]
|
|
|
|
|
|
|
|
|
|
- WARN( not (all (\bind -> fst bind >= 0) rel_binds),
|
|
|
|
|
- ppr binds $$ ppr rel_binds $$
|
|
|
|
|
- ppr frame_size $$ ppr real_sp $$ ppr frame_sp )
|
|
|
|
|
+ WARN( not (all (\bind -> fst bind >= 0) rel_binds), ppr binds $$ ppr rel_binds $$ ppr frame_size $$ ppr real_sp $$ ppr frame_sp )
|
|
|
|
|
return $ stack_layout rel_binds frame_size
|
|
|
|
|
|
|
|
|
|
stack_layout :: [(VirtualSpOffset, CgIdInfo)]
|
|
|
|
|
diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
|
2015-02-12 21:26:48 +01:00
|
|
|
index 638e1db..0aee4b7 100644
|
2015-02-04 00:34:08 +01:00
|
|
|
--- a/compiler/main/GHC.hs
|
|
|
|
|
+++ b/compiler/main/GHC.hs
|
|
|
|
|
@@ -788,8 +788,7 @@ load2 how_much mod_graph = do
|
|
|
|
|
-- is stable).
|
|
|
|
|
partial_mg
|
|
|
|
|
| LoadDependenciesOf _mod <- how_much
|
|
|
|
|
- = ASSERT( case last partial_mg0 of
|
|
|
|
|
- AcyclicSCC ms -> ms_mod_name ms == _mod; _ -> False )
|
|
|
|
|
+ = ASSERT( case last partial_mg0 of AcyclicSCC ms -> ms_mod_name ms == _mod; _ -> False )
|
|
|
|
|
List.init partial_mg0
|
|
|
|
|
| otherwise
|
|
|
|
|
= partial_mg0
|
2015-02-12 21:26:48 +01:00
|
|
|
@@ -879,8 +878,7 @@ load2 how_much mod_graph = do
|
|
|
|
|
liftIO $ cleanTempFilesExcept dflags (ppFilesFromSummaries mods_to_keep)
|
|
|
|
|
|
|
|
|
|
-- there should be no Nothings where linkables should be, now
|
|
|
|
|
- ASSERT(all (isJust.hm_linkable)
|
|
|
|
|
- (eltsUFM (hsc_HPT hsc_env))) do
|
|
|
|
|
+ ASSERT(all (isJust.hm_linkable) (eltsUFM (hsc_HPT hsc_env))) do
|
|
|
|
|
|
|
|
|
|
-- Link everything together
|
|
|
|
|
linkresult <- liftIO $ link (ghcLink dflags) dflags False hpt4
|
2015-02-04 00:34:08 +01:00
|
|
|
diff --git a/compiler/simplCore/SimplUtils.lhs b/compiler/simplCore/SimplUtils.lhs
|
|
|
|
|
index 99a63e4..3268726 100644
|
|
|
|
|
--- a/compiler/simplCore/SimplUtils.lhs
|
|
|
|
|
+++ b/compiler/simplCore/SimplUtils.lhs
|
|
|
|
|
@@ -388,8 +388,7 @@ mkArgInfo fun rules n_val_args call_cont
|
|
|
|
|
else
|
|
|
|
|
map isStrictDmd demands ++ vanilla_stricts
|
|
|
|
|
| otherwise
|
|
|
|
|
- -> WARN( True, text "More demands than arity" <+> ppr fun <+> ppr (idArity fun)
|
|
|
|
|
- <+> ppr n_val_args <+> ppr demands )
|
|
|
|
|
+ -> WARN( True, text "More demands than arity" <+> ppr fun <+> ppr (idArity fun) <+> ppr n_val_args <+> ppr demands )
|
|
|
|
|
vanilla_stricts -- Not enough args, or no strictness
|
|
|
|
|
|
|
|
|
|
add_type_str :: Type -> [Bool] -> [Bool]
|
|
|
|
|
@@ -1812,4 +1811,4 @@ without getting changed to c1=I# c2.
|
|
|
|
|
I don't think this is worth fixing, even if I knew how. It'll
|
|
|
|
|
all come out in the next pass anyway.
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
\ No newline at end of file
|
|
|
|
|
+
|
|
|
|
|
diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs
|
|
|
|
|
index d0fbd8d..ef87996 100644
|
|
|
|
|
--- a/compiler/simplCore/Simplify.lhs
|
|
|
|
|
+++ b/compiler/simplCore/Simplify.lhs
|
|
|
|
|
@@ -2071,8 +2071,7 @@ mkDupableAlt env case_bndr (con, bndrs', rhs')
|
|
|
|
|
rhs = mkConApp dc (map Type (tyConAppArgs scrut_ty)
|
|
|
|
|
++ varsToCoreExprs bndrs')
|
|
|
|
|
|
|
|
|
|
- LitAlt {} -> WARN( True, ptext (sLit "mkDupableAlt")
|
|
|
|
|
- <+> ppr case_bndr <+> ppr con )
|
|
|
|
|
+ LitAlt {} -> WARN( True, ptext (sLit "mkDupableAlt") <+> ppr case_bndr <+> ppr con )
|
|
|
|
|
case_bndr
|
|
|
|
|
-- The case binder is alive but trivial, so why has
|
|
|
|
|
-- it not been substituted away?
|
