[commit: ghc] master: Allow qualified names to be children in export lists (fa5a73f)

[git at git.haskell.org]

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

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

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

commit fa5a73f0a86908da31ec72ce33d37a7a704a0600
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Wed Apr 12 14:10:54 2017 -0400

    Allow qualified names to be children in export lists
    
    When doing this I noticed a horrible amount of duplication between
    lookupSubBndrOcc and lookupExportChild (which I am responsible for).
    I opened #13545 to keep track of this.
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: rwbarton, thomie
    
    GHC Trac Issues: #13528
    
    Differential Revision: https://phabricator.haskell.org/D3434


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

fa5a73f0a86908da31ec72ce33d37a7a704a0600
 compiler/typecheck/TcRnExports.hs |  2 +-
 testsuite/tests/module/T13528.hs  | 13 +++++++++++++
 testsuite/tests/module/all.T      |  2 ++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/compiler/typecheck/TcRnExports.hs b/compiler/typecheck/TcRnExports.hs
index 3c0b8d3..b3d9317 100644
--- a/compiler/typecheck/TcRnExports.hs
+++ b/compiler/typecheck/TcRnExports.hs
@@ -478,7 +478,7 @@ lookupExportChild parent rdr_name
   | otherwise = do
   gre_env <- getGlobalRdrEnv
 
-  let original_gres = lookupGRE_RdrName rdr_name gre_env
+  let original_gres = lookupGlobalRdrEnv gre_env (rdrNameOcc rdr_name)
   -- Disambiguate the lookup based on the parent information.
   -- The remaining GREs are things that we *could* export here, note that
   -- this includes things which have `NoParent`. Those are sorted in
diff --git a/testsuite/tests/module/T13528.hs b/testsuite/tests/module/T13528.hs
new file mode 100644
index 0000000..60363eb
--- /dev/null
+++ b/testsuite/tests/module/T13528.hs
@@ -0,0 +1,13 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
+module T13528 (
+  GHC.Exts.IsList(
+      Item
+      , fromList
+      , toList
+      )
+  , Data.Bool.Bool(True, False)
+) where
+
+import qualified GHC.Exts (IsList(..))
+import qualified Data.Bool (Bool(..))
diff --git a/testsuite/tests/module/all.T b/testsuite/tests/module/all.T
index d7e6b74..6d05c77 100644
--- a/testsuite/tests/module/all.T
+++ b/testsuite/tests/module/all.T
@@ -282,3 +282,5 @@ test('T11970', normal, compile_fail, [''])
 test('T11970A', [], multimod_compile, ['T11970A','-Wunused-imports'])
 test('T11970B', normal, compile_fail, [''])
 test('MultiExport', normal, compile, [''])
+test('T13528', normal, compile, [''])
+