summaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
authorsimonpj@microsoft.com <unknown>2009-11-05 12:03:59 +0000
committersimonpj@microsoft.com <unknown>2009-11-05 12:03:59 +0000
commit43b5afae2ef2a0ebd29d88dc379ddfc0c793bebd (patch)
tree68a774c45ead9420ae5585530c8593a61cf0ed46 /compiler
parenta075bccf8a21c3b98640b4f72a0ab7084c9b0882 (diff)
downloadhaskell-43b5afae2ef2a0ebd29d88dc379ddfc0c793bebd.tar.gz
Nuke the -finline-if-enough-args flag
By default INLINE functions only inline when they are given enough arguments, so the flag isn't needed
Diffstat (limited to 'compiler')
-rw-r--r--compiler/coreSyn/CoreSubst.lhs2
-rw-r--r--compiler/main/DynFlags.hs3
2 files changed, 1 insertions, 4 deletions
diff --git a/compiler/coreSyn/CoreSubst.lhs b/compiler/coreSyn/CoreSubst.lhs
index 3224cc2763..4b42c0dcaf 100644
--- a/compiler/coreSyn/CoreSubst.lhs
+++ b/compiler/coreSyn/CoreSubst.lhs
@@ -13,7 +13,7 @@ module CoreSubst (
-- ** Substituting into expressions and related types
deShadowBinds, substSpec, substRulesForImportedIds,
substTy, substExpr, substBind, substUnfolding,
- substInlineRuleGuidance, lookupIdSubst, lookupTvSubst, substIdOcc,
+ substInlineRuleInfo, lookupIdSubst, lookupTvSubst, substIdOcc,
-- ** Operations on substitutions
emptySubst, mkEmptySubst, mkSubst, mkOpenSubst, substInScope, isEmptySubst,
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index ab9d8216a2..f0feb2f8ec 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -279,7 +279,6 @@ data DynFlag
| Opt_UnboxStrictFields
| Opt_MethodSharing
| Opt_DictsCheap
- | Opt_InlineIfEnoughArgs
| Opt_EnableRewriteRules -- Apply rewrite rules during simplification
| Opt_Vectorise
| Opt_RegsGraph -- do graph coloring register allocation
@@ -1725,7 +1724,6 @@ fFlags = [
( "unbox-strict-fields", Opt_UnboxStrictFields, const Supported ),
( "method-sharing", Opt_MethodSharing, const Supported ),
( "dicts-cheap", Opt_DictsCheap, const Supported ),
- ( "inline-if-enough-args", Opt_InlineIfEnoughArgs, const Supported ),
( "excess-precision", Opt_ExcessPrecision, const Supported ),
( "eager-blackholing", Opt_EagerBlackHoling, const Supported ),
( "asm-mangling", Opt_DoAsmMangling, const Supported ),
@@ -2148,7 +2146,6 @@ setDPHOpt dflags = setOptLevel 2 (dflags { maxSimplIterations = 20
})
`dopt_set` Opt_DictsCheap
`dopt_unset` Opt_MethodSharing
- `dopt_set` Opt_InlineIfEnoughArgs
data DPHBackend = DPHPar
| DPHSeq