From: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
Date: Mon, 14 Nov 2016 16:35:40 +0000 (+0000)
Subject: buildpath-abi-stability
X-Git-Tag: archive/raspbian/8.0.2-9+rpi1~1^2^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=00a1b5581b89a2825acf393ae208ff254ba555c8;p=ghc.git

buildpath-abi-stability

Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424


Gbp-Pq: Name buildpath-abi-stability.patch
---

diff --git a/compiler/iface/MkIface.hs b/compiler/iface/MkIface.hs
index 1a31afd5..47c4706e 100644
--- a/compiler/iface/MkIface.hs
+++ b/compiler/iface/MkIface.hs
@@ -556,7 +556,7 @@ addFingerprints hsc_env mb_old_fingerprint iface0 new_decls
    iface_hash <- computeFingerprint putNameLiterally
                       (mod_hash,
                        ann_fn (mkVarOcc "module"),  -- See mkIfaceAnnCache
-                       mi_usages iface0,
+                       usages,
                        sorted_deps,
                        mi_hpc iface0)
 
@@ -589,6 +589,9 @@ addFingerprints hsc_env mb_old_fingerprint iface0 new_decls
     (non_orph_fis,   orph_fis)   = mkOrphMap ifFamInstOrph (mi_fam_insts iface0)
     fix_fn = mi_fix_fn iface0
     ann_fn = mkIfaceAnnCache (mi_anns iface0)
+    -- Do not allow filenames to affect the interface
+    usages = [ case u of UsageFile _ fp -> UsageFile "" fp; _ -> u | u <- mi_usages iface0 ]
+
 
 getOrphanHashes :: HscEnv -> [Module] -> IO [Fingerprint]
 getOrphanHashes hsc_env mods = do