[commit: ghc] wip/ghc-8.8-merges: GhcPlugins: Fix lookup of TH names (0113490)

[git at git.haskell.org]

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

On branch  : wip/ghc-8.8-merges
Link       : http://ghc.haskell.org/trac/ghc/changeset/0113490e4b01b6be06d290ad464119c8b3a9492e/ghc

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

commit 0113490e4b01b6be06d290ad464119c8b3a9492e
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Jan 19 13:59:18 2019 -0500

    GhcPlugins: Fix lookup of TH names
    
    Previously `thNameToGhcName` was calling `lookupOrigNameCache` directly, which
    failed to handle the case that the name wasn't already in the name cache. This
    happens, for instance, when the name was in scope in a plugin being used during
    compilation but not in scope in the module being compiled. In this case we the
    interface file containing the name won't be loaded and `lookupOrigNameCache`
    fails. This was the cause of #16104.
    
    The solution is simple: use the nicely packaged `lookupOrigIO` instead.


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

0113490e4b01b6be06d290ad464119c8b3a9492e
 compiler/main/GhcPlugins.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/main/GhcPlugins.hs b/compiler/main/GhcPlugins.hs
index 3e0facf..5649237 100644
--- a/compiler/main/GhcPlugins.hs
+++ b/compiler/main/GhcPlugins.hs
@@ -87,7 +87,7 @@ import Unique           ( Unique, Uniquable(..) )
 import FastString
 import Data.Maybe
 
-import NameCache (lookupOrigNameCache)
+import IfaceEnv         ( lookupOrigIO )
 import GhcPrelude
 import MonadUtils       ( mapMaybeM )
 import Convert          ( thRdrNameGuesses )
@@ -127,6 +127,6 @@ thNameToGhcName th_name
       | Just n <- isExact_maybe rdr_name   -- This happens in derived code
       = return $ if isExternalName n then Just n else Nothing
       | Just (rdr_mod, rdr_occ) <- isOrig_maybe rdr_name
-      = do { cache <- getOrigNameCache
-           ; return $ lookupOrigNameCache cache rdr_mod rdr_occ }
+      = do { hsc_env <- getHscEnv
+           ; Just <$> liftIO (lookupOrigIO hsc_env rdr_mod rdr_occ) }
       | otherwise = return Nothing