Fix a space leak in :trace (trac #2128)

[ghc-hetmet.git] / compiler / main / StaticFlags.hs

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index 59e125c..bf0e822 100644 (file)
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -44,11 +44,11 @@ module StaticFlags (
        opt_IrrefutableTuples,
        opt_Parallel,
        opt_RuntimeTypes,
-       opt_Flatten,
 
        -- optimisation opts
        opt_NoMethodSharing, 
        opt_NoStateHack,
+       opt_SpecInlineJoinPoints,
        opt_CprOff,
        opt_SimplNoPreInlining,
        opt_SimplExcessPrecision,
@@ -300,9 +300,9 @@ opt_Hpc                             = lookUp FSLIT("-fhpc")
 opt_DictsStrict                        = lookUp  FSLIT("-fdicts-strict")
 opt_IrrefutableTuples          = lookUp  FSLIT("-firrefutable-tuples")
 opt_Parallel                   = lookUp  FSLIT("-fparallel")
-opt_Flatten                    = lookUp  FSLIT("-fflatten")
 
 -- optimisation opts
+opt_SpecInlineJoinPoints       = lookUp  FSLIT("-fspec-inline-join-points")
 opt_NoStateHack                        = lookUp  FSLIT("-fno-state-hack")
 opt_NoMethodSharing            = lookUp  FSLIT("-fno-method-sharing")
 opt_CprOff                     = lookUp  FSLIT("-fcpr-off")
@@ -362,9 +362,9 @@ isStaticFlag f =
        "fauto-sccs-on-individual-cafs",
        "fscc-profiling",
        "fdicts-strict",
+       "fspec-inline-join-points",
        "firrefutable-tuples",
        "fparallel",
-       "fflatten",
        "fgransim",
        "fno-hi-version-check",
        "dno-black-holing",
@@ -489,6 +489,7 @@ allowed_combination way = and [ x `allowedWith` y
        WayDebug `allowedWith` _                = True
 
        WayProf `allowedWith` WayNDP            = True
+       WayThreaded `allowedWith` WayProf       = True
        _ `allowedWith` _                       = False
 
 
@@ -600,7 +601,7 @@ way_details =
 
     (WayNDP, Way  "ndp" False "Nested data parallelism"
        [ "-fparr"
-       , "-fflatten"]),
+       , "-fvectorise"]),
 
     (WayUser_a,  Way  "a"  False "User way 'a'"  ["$WAY_a_REAL_OPTS"]),        
     (WayUser_b,  Way  "b"  False "User way 'b'"  ["$WAY_b_REAL_OPTS"]),