summaryrefslogtreecommitdiff
path: root/ghc
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2015-03-16 18:36:59 +0100
committerThomas Miedema <thomasmiedema@gmail.com>2015-03-16 18:38:58 +0100
commit5166ee94e439375a4e6acb80f88ec6ee65476bbd (patch)
treef79b90d82c995faea5e03c66ae2f19920b90f52f /ghc
parentbeee618c4ab8f725acd4dce3ef8a0d4ce84bb6ec (diff)
downloadhaskell-5166ee94e439375a4e6acb80f88ec6ee65476bbd.tar.gz
Dont call unsafeGlobalDynFlags if it is not set
Parsing of static and mode flags happens before any session is started, i.e., before the first call to 'GHC.withGhc'. Therefore, to report errors for invalid usage of these two types of flags, we can not call any function that needs DynFlags, as there are no DynFlags available yet (unsafeGlobalDynFlags is not set either). So we always print "on the commandline" as the location, which is true except for Api users, which is probably ok. When reporting errors for invalid usage of dynamic flags we /can/ make use of DynFlags, and we do so explicitly in DynFlags.parseDynamicFlagsFull. Before, we called unsafeGlobalDynFlags when an invalid (combination of) flag(s) was given on the commandline, resulting in panics (#9963). This regression was introduced in 1d6124de. Also rename showSDocSimple to showSDocUnsafe, to hopefully prevent this from happening again. Reviewed By: austin Differential Revision: https://phabricator.haskell.org/D730 GHC Trac Issues: #9963
Diffstat (limited to 'ghc')
-rw-r--r--ghc/Main.hs9
1 files changed, 6 insertions, 3 deletions
diff --git a/ghc/Main.hs b/ghc/Main.hs
index f0539df6cd..d30a50b7cd 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE CPP, NondecreasingIndentation #-}
+{-# LANGUAGE CPP, NondecreasingIndentation, TupleSections #-}
{-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-}
-----------------------------------------------------------------------------
@@ -517,8 +517,11 @@ parseModeFlags args = do
mode = case mModeFlag of
Nothing -> doMakeMode
Just (m, _) -> m
- errs = errs1 ++ map (mkGeneralLocated "on the commandline") errs2
- when (not (null errs)) $ throwGhcException $ errorsToGhcException errs
+
+ -- See Note [Handling errors when parsing commandline flags]
+ unless (null errs1 && null errs2) $ throwGhcException $ errorsToGhcException $
+ map (("on the commandline", )) $ map unLoc errs1 ++ errs2
+
return (mode, flags' ++ leftover, warns)
type ModeM = CmdLineP (Maybe (Mode, String), [String], [Located String])