diff options
| author | Zubin Duggal <zubin.duggal@gmail.com> | 2021-11-19 14:21:58 +0530 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-04-06 13:02:04 -0400 |
| commit | babb47d263e0df0fa4e16da6bf86164a2a3e07ea (patch) | |
| tree | 63f9ea3a73ca093e10d14e8a368d6adfadc0f895 /utils | |
| parent | d2ae0a3a1a8e31e5d769f1aea95e85793043cb3a (diff) | |
| download | haskell-babb47d263e0df0fa4e16da6bf86164a2a3e07ea.tar.gz | |
Add warnings for file header pragmas that appear in the body of a module (#20385)
Once we are done parsing the header of a module to obtain the options, we
look through the rest of the tokens in order to determine if they contain any
misplaced file header pragmas that would usually be ignored, potentially
resulting in bad error messages.
The warnings are reported immediately so that later errors don't shadow
over potentially helpful warnings.
Metric Increase:
T13719
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/check-exact/Parsers.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/check-exact/Parsers.hs b/utils/check-exact/Parsers.hs index cff37bf309..b592a4cee4 100644 --- a/utils/check-exact/Parsers.hs +++ b/utils/check-exact/Parsers.hs @@ -305,7 +305,7 @@ initDynFlags :: GHC.GhcMonad m => FilePath -> m GHC.DynFlags initDynFlags file = do dflags0 <- GHC.getSessionDynFlags let parser_opts0 = GHC.initParserOpts dflags0 - src_opts <- GHC.liftIO $ GHC.getOptionsFromFile parser_opts0 file + (_, src_opts) <- GHC.liftIO $ GHC.getOptionsFromFile parser_opts0 file (dflags1, _, _) <- GHC.parseDynamicFilePragma dflags0 src_opts -- Turn this on last to avoid T10942 let dflags2 = dflags1 `GHC.gopt_set` GHC.Opt_KeepRawTokenStream @@ -332,7 +332,7 @@ initDynFlagsPure fp s = do -- no reason to use it. dflags0 <- GHC.getSessionDynFlags let parser_opts0 = GHC.initParserOpts dflags0 - let pragmaInfo = GHC.getOptions parser_opts0 (GHC.stringToStringBuffer $ s) fp + let (_, pragmaInfo) = GHC.getOptions parser_opts0 (GHC.stringToStringBuffer $ s) fp (dflags1, _, _) <- GHC.parseDynamicFilePragma dflags0 pragmaInfo -- Turn this on last to avoid T10942 let dflags2 = dflags1 `GHC.gopt_set` GHC.Opt_KeepRawTokenStream |