Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : new-demand
http://hackage.haskell.org/trac/ghc/changeset/cd20daa999f2b044b78c1c9016a9c95675191c76 >--------------------------------------------------------------- commit cd20daa999f2b044b78c1c9016a9c95675191c76 Author: Ilya Sergey <[email protected]> Date: Tue Jul 3 23:32:25 2012 +0100 cleanup >--------------------------------------------------------------- compiler/main/DynFlags.hs | 3 --- compiler/simplCore/SimplCore.lhs | 3 +-- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 3f9a44d..8dbf955 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -255,7 +255,6 @@ data DynFlag -- optimisation opts | Opt_Strictness - | Opt_NewStrictness | Opt_FullLaziness | Opt_FloatIn | Opt_Specialise @@ -1984,7 +1983,6 @@ fFlags :: [FlagSpec DynFlag] fFlags = [ ( "print-explicit-foralls", Opt_PrintExplicitForalls, nop ), ( "strictness", Opt_Strictness, nop ), - ( "new-strictness", Opt_NewStrictness, nop ), ( "specialise", Opt_Specialise, nop ), ( "float-in", Opt_FloatIn, nop ), ( "static-argument-transformation", Opt_StaticArgumentTransformation, nop ), @@ -2275,7 +2273,6 @@ optLevelFlags , ([1,2], Opt_DoEtaReduction) , ([1,2], Opt_CaseMerge) , ([1,2], Opt_Strictness) - , ([1,2], Opt_NewStrictness) , ([1,2], Opt_CSE) , ([1,2], Opt_FullLaziness) , ([1,2], Opt_Specialise) diff --git a/compiler/simplCore/SimplCore.lhs b/compiler/simplCore/SimplCore.lhs index 85d1050..348b12f 100644 --- a/compiler/simplCore/SimplCore.lhs +++ b/compiler/simplCore/SimplCore.lhs @@ -121,8 +121,7 @@ getCoreToDo dflags phases = simplPhases dflags max_iter = maxSimplIterations dflags rule_check = ruleCheck dflags - strictness = (dopt Opt_Strictness dflags - || dopt Opt_NewStrictness dflags) + strictness = dopt Opt_Strictness dflags new_demand = xopt Opt_NewDemandAnalyser dflags full_laziness = dopt Opt_FullLaziness dflags do_specialise = dopt Opt_Specialise dflags _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
