[commit: ghc] master: Fix #11624, cannot declare hs-boot if already one in scope. (fc16690)

[git at git.haskell.org]

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

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

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

commit fc16690a536b74e7af72e963599471474e3df603
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Fri Mar 11 10:37:26 2016 +0100

    Fix #11624, cannot declare hs-boot if already one in scope.
    
    I'm not sure if this fix is the "right way" to do it, but
    it solves the proximal problem, which is that lookupBindGroupOcc
    was picking out the wrong renaming for hs-boot signatures,
    which then lead to an interface file error.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: validate
    
    Reviewers: simonpj, hvr, austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1963
    
    GHC Trac Issues: #11624


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

fc16690a536b74e7af72e963599471474e3df603
 compiler/rename/RnBinds.hs                         | 22 +++++++---------------
 compiler/rename/RnEnv.hs                           |  4 ++--
 compiler/rename/RnSource.hs                        |  8 +++++++-
 testsuite/tests/driver/sigof02/all.T               |  8 ++++----
 testsuite/tests/driver/sigof02/sigof02dmt.stderr   | 15 ++++++++-------
 testsuite/tests/driver/sigof02/sigof02dt.stderr    | 15 ++++++++-------
 testsuite/tests/rename/should_compile/T11624.hs    |  4 ++++
 .../tests/rename/should_compile/T11624.hs-boot     |  3 +++
 .../tests/rename/should_compile/T11624.stderr      |  3 +++
 testsuite/tests/rename/should_compile/T11624a.hs   |  4 ++++
 testsuite/tests/rename/should_compile/all.T        |  1 +
 11 files changed, 51 insertions(+), 36 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc fc16690a536b74e7af72e963599471474e3df603