Commit bbfff229 authored by Edward Z. Yang's avatar Edward Z. Yang Committed by Ben Gamari
Browse files

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
f16ddcee

 we may refer to TH
names even in stage 1, and this was causing uniques to not
be setup properly.
Signed-off-by: default avatarEdward Z. Yang <ezyang@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
parent bb5afd3c
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment