[commit: ghc] master: Unconditionally handle TH known key names. (bbfff22)

[git at git.haskell.org]

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

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

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

commit bbfff2298d7ea7d0f4e590f8137f43a651e8f61d
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Thu Feb 25 21:47:30 2016 +0100

    Unconditionally handle TH known key names.
    
    Previously, we didn't add Template Haskell key names to the list
    of known uniques when building a stage 1 compiler.  But with
    f16ddcee0c64a92ab911a7841a8cf64e3ac671fd we may refer to TH
    names even in stage 1, and this was causing uniques to not
    be setup properly.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: validate and run stage1 test suite
    
    Reviewers: osa1, austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1520
    
    GHC Trac Issues: #10382


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

bbfff2298d7ea7d0f4e590f8137f43a651e8f61d
 compiler/main/HscMain.hs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs
index b1daae5..d9aae24 100644
--- a/compiler/main/HscMain.hs
+++ b/compiler/main/HscMain.hs
@@ -90,12 +90,12 @@ import Type             ( Type )
 import {- Kind parts of -} Type         ( Kind )
 import CoreLint         ( lintInteractiveExpr )
 import VarEnv           ( emptyTidyEnv )
-import THNames          ( templateHaskellNames )
 import Panic
 import ConLike
 import Control.Concurrent
 #endif
 
+import THNames          ( templateHaskellNames )
 import Module
 import Packages
 import RdrName
@@ -208,9 +208,7 @@ allKnownKeyNames                -- where templateHaskellNames are defined
   = all_names
   where
     all_names = knownKeyNames
-#ifdef GHCI
                 ++ templateHaskellNames
-#endif
 
     namesEnv      = foldl (\m n -> extendNameEnv_Acc (:) singleton m n n)
                           emptyUFM all_names