summaryrefslogtreecommitdiff
path: root/compiler/main
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2018-04-16 14:36:11 -0400
committerBen Gamari <ben@smart-cactus.org>2018-04-16 14:36:49 -0400
commit0e37361392a910ccbbb2719168f4e8d8272b2ae2 (patch)
tree822951c84dfdaaec54d46550defe0f77e0b61cf2 /compiler/main
parent09128f3a3d754abcef63480bc7e2e901d30b155a (diff)
downloadhaskell-0e37361392a910ccbbb2719168f4e8d8272b2ae2.tar.gz
Revert "Enhanced constant folding"
I need to upgrade GHC on the CI builders before landing this due to a bug in 8.2.1 triggered by this patch. This reverts commit fea04defa64871caab6339ff3fc5511a272f37c7.
Diffstat (limited to 'compiler/main')
-rw-r--r--compiler/main/DynFlags.hs3
1 files changed, 0 insertions, 3 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 690d3f4a51..6bfa8f2955 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -491,7 +491,6 @@ data GeneralFlag
| Opt_SolveConstantDicts
| Opt_AlignmentSanitisation
| Opt_CatchBottoms
- | Opt_NumConstantFolding
-- PreInlining is on by default. The option is there just to see how
-- bad things get if you turn it off!
@@ -3998,7 +3997,6 @@ fFlagsDeps = [
flagSpec "solve-constant-dicts" Opt_SolveConstantDicts,
flagSpec "catch-bottoms" Opt_CatchBottoms,
flagSpec "alignment-sanitisation" Opt_AlignmentSanitisation,
- flagSpec "num-constant-folding" Opt_NumConstantFolding,
flagSpec "show-warning-groups" Opt_ShowWarnGroups,
flagSpec "hide-source-paths" Opt_HideSourcePaths,
flagSpec "show-hole-constraints" Opt_ShowHoleConstraints,
@@ -4392,7 +4390,6 @@ optLevelFlags -- see Note [Documenting optimisation flags]
, ([1,2], Opt_CprAnal)
, ([1,2], Opt_WorkerWrapper)
, ([1,2], Opt_SolveConstantDicts)
- , ([1,2], Opt_NumConstantFolding)
, ([2], Opt_LiberateCase)
, ([2], Opt_SpecConstr)