diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-11-01 21:12:11 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-12-21 01:46:00 -0500 |
| commit | 8ea79a16c57a9fcfd091ab7f4aa457e100fa42b5 (patch) | |
| tree | 77d85883564bc1f99d3950aa48aa1d5d422b86f9 /compiler | |
| parent | d47bb1099f388b68116dabf16afb1c551eb9588a (diff) | |
| download | haskell-8ea79a16c57a9fcfd091ab7f4aa457e100fa42b5.tar.gz | |
Rename -fcatch-bottoms to -fcatch-nonexhaustive-cases
As noted in #20601, the previous name was rather misleading.
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/GHC/CoreToStg/Prep.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/Driver/Flags.hs | 4 | ||||
| -rw-r--r-- | compiler/GHC/Driver/Session.hs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/compiler/GHC/CoreToStg/Prep.hs b/compiler/GHC/CoreToStg/Prep.hs index bc12ec2b63..918530695f 100644 --- a/compiler/GHC/CoreToStg/Prep.hs +++ b/compiler/GHC/CoreToStg/Prep.hs @@ -855,7 +855,7 @@ cpeRhsE env (Case scrut bndr ty alts) -- enabled we instead produce an 'error' expression to catch -- the case where a function we think should bottom -- unexpectedly returns. - | gopt Opt_CatchBottoms (cpe_dynFlags env) + | gopt Opt_CatchNonexhaustiveCases (cpe_dynFlags env) , not (altsAreExhaustive alts) = addDefault alts (Just err) | otherwise = alts diff --git a/compiler/GHC/Driver/Flags.hs b/compiler/GHC/Driver/Flags.hs index d0d114dba8..ee5144854d 100644 --- a/compiler/GHC/Driver/Flags.hs +++ b/compiler/GHC/Driver/Flags.hs @@ -227,7 +227,7 @@ data GeneralFlag | Opt_WorkerWrapper | Opt_SolveConstantDicts | Opt_AlignmentSanitisation - | Opt_CatchBottoms + | Opt_CatchNonexhaustiveCases | Opt_NumConstantFolding | Opt_CoreConstantFolding | Opt_FastPAPCalls -- #6084 @@ -443,7 +443,7 @@ optimisationFlags = EnumSet.fromList , Opt_CprAnal , Opt_WorkerWrapper , Opt_SolveConstantDicts - , Opt_CatchBottoms + , Opt_CatchNonexhaustiveCases , Opt_IgnoreAsserts ] diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs index 044f2b3d5d..be30e36052 100644 --- a/compiler/GHC/Driver/Session.hs +++ b/compiler/GHC/Driver/Session.hs @@ -3395,7 +3395,7 @@ fFlagsDeps = [ flagSpec "version-macros" Opt_VersionMacros, flagSpec "worker-wrapper" Opt_WorkerWrapper, flagSpec "solve-constant-dicts" Opt_SolveConstantDicts, - flagSpec "catch-bottoms" Opt_CatchBottoms, + flagSpec "catch-nonexhaustive-cases" Opt_CatchNonexhaustiveCases, flagSpec "alignment-sanitisation" Opt_AlignmentSanitisation, flagSpec "check-prim-bounds" Opt_DoBoundsChecking, flagSpec "num-constant-folding" Opt_NumConstantFolding, |