[commit: ghc] master: Comments only (797a462)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/797a46239d958841219f0f7769b0016b1b23d5ca/ghc

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

commit 797a46239d958841219f0f7769b0016b1b23d5ca
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu May 10 17:30:09 2018 +0100

    Comments only


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

797a46239d958841219f0f7769b0016b1b23d5ca
 compiler/typecheck/TcInteract.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/typecheck/TcInteract.hs b/compiler/typecheck/TcInteract.hs
index 41afe3f..c71a01a 100644
--- a/compiler/typecheck/TcInteract.hs
+++ b/compiler/typecheck/TcInteract.hs
@@ -2507,8 +2507,8 @@ matchInstEnv dflags short_cut_solver clas tys loc
             ([(ispec, inst_tys)], [], False)
                 | short_cut_solver
                 , isOverlappable ispec
-                -- If the instance has OVERLAPPABLE or OVERLAPS then
-                -- don't let the short-cut solver choose it, because a
+                -- If the instance has OVERLAPPABLE or OVERLAPS or INCOHERENT
+                -- then don't let the short-cut solver choose it, because a
                 -- later instance might overlap it.  Trac #14434 is an example
                 -- See Note [Shortcut solving: overlap]
                 -> do { traceTcS "matchClass: ingnoring overlappable" (ppr pred)