[commit: ghc] master: Comments only (7da3d30)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7da3d30cbe52bf25b901a5e18031987a55c52e85/ghc

>---------------------------------------------------------------

commit 7da3d30cbe52bf25b901a5e18031987a55c52e85
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Oct 6 09:53:18 2015 +0100

    Comments only


>---------------------------------------------------------------

7da3d30cbe52bf25b901a5e18031987a55c52e85
 compiler/typecheck/Inst.hs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/compiler/typecheck/Inst.hs b/compiler/typecheck/Inst.hs
index 18a0e2f..f4caf2b 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