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 94ce378d08d01efe7ce8d3fc42db204f7b670c23..7ca9a2ab18ef324a44a8df054c1c0032ab561677 100644 (file)
--- a/compiler/iface/MkIface.hs
+++ b/compiler/iface/MkIface.hs
@@ -611,7 +611,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)
 
@@ -644,6 +644,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