summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2015-10-06 09:53:18 +0100
committerSimon Peyton Jones <simonpj@microsoft.com>2015-10-06 09:53:43 +0100
commit7da3d30cbe52bf25b901a5e18031987a55c52e85 (patch)
treee75f6d9d96d9631f2a056e6ea2c71e7685192fed
parentca816c6db6c9cbce4cf1670a791dd541c3edf771 (diff)
downloadhaskell-7da3d30cbe52bf25b901a5e18031987a55c52e85.tar.gz
Comments only
-rw-r--r--compiler/typecheck/Inst.hs3
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/typecheck/Inst.hs b/compiler/typecheck/Inst.hs
index 18a0e2fd47..f4caf2b74a 100644
--- a/compiler/typecheck/Inst.hs
+++ b/compiler/typecheck/Inst.hs
@@ -407,6 +407,9 @@ syntaxNameCtxt name orig ty tidy_env
-}
getOverlapFlag :: Maybe OverlapMode -> TcM OverlapFlag
+-- Construct the OverlapFlag from the global module flags,
+-- but if the overlap_mode argument is (Just m),
+-- set the OverlapMode to 'm'
getOverlapFlag overlap_mode
= do { dflags <- getDynFlags
; let overlap_ok = xopt Opt_OverlappingInstances dflags