From: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
Date: Sat, 21 Sep 2019 10:06:31 +0000 (+0100)
Subject: buildpath-abi-stability
X-Git-Tag: archive/raspbian/8.8.1+dfsg1+is+8.6.5+dfsg1-2+rpi1^2~13
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0c7760b7935c0f7db7ad14c15b0b3a166d463fe7;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 32c825cf..cd60bd0d 100644
--- a/compiler/iface/MkIface.hs
+++ b/compiler/iface/MkIface.hs
@@ -712,7 +712,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)
 
@@ -747,6 +747,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 ]
+
 
 -- | Retrieve the orphan hashes 'mi_orphan_hash' for a list of modules
 -- (in particular, the orphan modules which are transitively imported by the