diff options
| author | Patrick Palka <patrick@parcs.ath.cx> | 2013-08-30 12:54:22 -0400 |
|---|---|---|
| committer | Patrick Palka <patrick@parcs.ath.cx> | 2013-08-30 12:54:22 -0400 |
| commit | 26bf3dd478dce53eb50c2ce13821d61e416e3fe7 (patch) | |
| tree | 7b025b1eca208e96cf5e1916dd12f0054fda79ea /compiler/iface/MkIface.lhs | |
| parent | 6d755c08ca125d991a95fbdc3ae1dc0608b722f1 (diff) | |
| parent | 85c1715d086bf2d35bc05133398f462919f2aa7b (diff) | |
| download | haskell-26bf3dd478dce53eb50c2ce13821d61e416e3fe7.tar.gz | |
Merge branch 'master' into ghc-parmake-gsoc
Conflicts:
compiler/main/DynFlags.hs
compiler/utils/FastString.lhs
Diffstat (limited to 'compiler/iface/MkIface.lhs')
| -rw-r--r-- | compiler/iface/MkIface.lhs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/compiler/iface/MkIface.lhs b/compiler/iface/MkIface.lhs index 765bee2d6d..d3b56d1f7b 100644 --- a/compiler/iface/MkIface.lhs +++ b/compiler/iface/MkIface.lhs @@ -1723,7 +1723,7 @@ toIfaceIdInfo id_info inline_hsinfo, unfold_hsinfo] of [] -> NoInfo infos -> HasInfo infos - -- NB: strictness must appear in the list before unfolding + -- NB: strictness and arity must appear in the list before unfolding -- See TcIface.tcUnfolding where ------------ Arity -------------- @@ -1762,10 +1762,7 @@ toIfUnfolding lb (CoreUnfolding { uf_tmpl = rhs, uf_arity = arity -> case guidance of UnfWhen unsat_ok boring_ok -> IfInlineRule arity unsat_ok boring_ok if_rhs _other -> IfCoreUnfold True if_rhs - InlineWrapper w | isExternalName n -> IfExtWrapper arity n - | otherwise -> IfLclWrapper arity (getFS n) - where - n = idName w + InlineWrapper -> IfWrapper if_rhs InlineCompulsory -> IfCompulsory if_rhs InlineRhs -> IfCoreUnfold False if_rhs -- Yes, even if guidance is UnfNever, expose the unfolding |