diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-10-09 23:28:13 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-10-09 23:28:13 +0100 |
| commit | e731cb1330d818631373a041e2566b3590bf46ea (patch) | |
| tree | 9ba2cebff6808c5798987390286af830cd993a02 /compiler/main | |
| parent | a327c140fd932302e5bb2252ef127c7027874bc0 (diff) | |
| download | haskell-e731cb1330d818631373a041e2566b3590bf46ea.tar.gz | |
Make -f(no-)pre-inlining a dynamic flag
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/DynFlags.hs | 6 | ||||
| -rw-r--r-- | compiler/main/StaticFlagParser.hs | 1 | ||||
| -rw-r--r-- | compiler/main/StaticFlags.hs | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index b23bab1c41..35821b0114 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -341,6 +341,10 @@ data DynFlag | Opt_RelativeDynlibPaths | Opt_Hpc + -- PreInlining is on by default. The option is there just to see how + -- bad things get if you turn it off! + | Opt_SimplPreInlining + -- output style opts | Opt_ErrorSpans -- Include full span info in error messages, -- instead of just the start position. @@ -2331,6 +2335,7 @@ fFlags = [ ( "prof-count-entries", Opt_ProfCountEntries, nop ), ( "prof-cafs", Opt_AutoSccsOnIndividualCafs, nop ), ( "hpc", Opt_Hpc, nop ), + ( "pre-inlining", Opt_SimplPreInlining, nop ), ( "use-rpaths", Opt_RPath, nop ) ] @@ -2512,6 +2517,7 @@ defaultFlags settings Opt_GhciHistory, Opt_HelpfulErrors, Opt_ProfCountEntries, + Opt_SimplPreInlining, Opt_RPath ] diff --git a/compiler/main/StaticFlagParser.hs b/compiler/main/StaticFlagParser.hs index 45d37c7d0d..8397cce8bf 100644 --- a/compiler/main/StaticFlagParser.hs +++ b/compiler/main/StaticFlagParser.hs @@ -120,7 +120,6 @@ isStaticFlag f = "dno-black-holing", "fno-state-hack", "fruntime-types", - "fno-pre-inlining", "fno-opt-coercion", "fno-flat-cache", "fexcess-precision", diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs index 6330b2e872..69de53eb9d 100644 --- a/compiler/main/StaticFlags.hs +++ b/compiler/main/StaticFlags.hs @@ -35,7 +35,6 @@ module StaticFlags ( -- optimisation opts opt_NoStateHack, opt_CprOff, - opt_SimplNoPreInlining, opt_SimplExcessPrecision, opt_NoOptCoercion, opt_NoFlatCache, @@ -179,10 +178,6 @@ opt_CprOff = lookUp (fsLit "-fcpr-off") -- Switch off CPR analysis in the new demand analyser -- Simplifier switches -opt_SimplNoPreInlining :: Bool -opt_SimplNoPreInlining = lookUp (fsLit "-fno-pre-inlining") - -- NoPreInlining is there just to see how bad things - -- get if you don't do it! opt_SimplExcessPrecision :: Bool opt_SimplExcessPrecision = lookUp (fsLit "-fexcess-precision") |