diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2016-07-20 19:04:10 +0200 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-07-20 19:35:33 +0200 |
| commit | 83e4f49577665278fe08fbaafe2239553f3c448e (patch) | |
| tree | 8cb7cbd315261e09d2a78b5f15a64232c628d199 /compiler/iface/BinIface.hs | |
| parent | cf989ffe490c146be4ed0fd7e0c00d3ff8fe1453 (diff) | |
| download | haskell-83e4f49577665278fe08fbaafe2239553f3c448e.tar.gz | |
Revert "Clean up interaction between name cache and built-in syntax"
This reverts commit 9513fe6bdeafd35ca1a04e17b5f94732516766aa.
Sadly this broke with -DDEBUG.
Diffstat (limited to 'compiler/iface/BinIface.hs')
| -rw-r--r-- | compiler/iface/BinIface.hs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler/iface/BinIface.hs b/compiler/iface/BinIface.hs index 692632f7bc..42907049f3 100644 --- a/compiler/iface/BinIface.hs +++ b/compiler/iface/BinIface.hs @@ -275,10 +275,7 @@ fromOnDiskName :: Array Int Name -> NameCache -> OnDiskName -> (NameCache, Name) fromOnDiskName _ nc (pid, mod_name, occ) = let mod = mkModule pid mod_name cache = nsNames nc - in -- We use lookupOrigNameCache' here since we will never see any built-in - -- syntax in an interface file that isn't in the name cache (for instance - -- tuple TyCons). See Note [Symbol table representation of names]. - case lookupOrigNameCache' cache mod occ of + in case lookupOrigNameCache cache mod occ of Just name -> (nc, name) Nothing -> let (uniq, us) = takeUniqFromSupply (nsUniqs nc) |