projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of http://darcs.haskell.org/ghc
[ghc-hetmet.git]
/
compiler
/
iface
/
LoadIface.lhs
diff --git
a/compiler/iface/LoadIface.lhs
b/compiler/iface/LoadIface.lhs
index
3a4cfe5
..
e92a160
100644
(file)
--- a/
compiler/iface/LoadIface.lhs
+++ b/
compiler/iface/LoadIface.lhs
@@
-31,7
+31,7
@@
import TcRnMonad
import PrelNames
import PrelInfo
import PrelNames
import PrelInfo
-import PrelRules
+import MkId ( seqId )
import Rules
import Annotations
import InstEnv
import Rules
import Annotations
import InstEnv
@@
-42,7
+42,7
@@
import Module
import Maybes
import ErrUtils
import Finder
import Maybes
import ErrUtils
import Finder
-import LazyUniqFM
+import UniqFM
import StaticFlags
import Outputable
import BinIface
import StaticFlags
import Outputable
import BinIface
@@
-257,6
+257,7
@@
loadInterface doc_str mod from
}
; updateEps_ $ \ eps ->
}
; updateEps_ $ \ eps ->
+ if elemModuleEnv mod (eps_PIT eps) then eps else
eps {
eps_PIT = extendModuleEnv (eps_PIT eps) mod final_iface,
eps_PTE = addDeclsToPTE (eps_PTE eps) new_eps_decls,
eps {
eps_PIT = extendModuleEnv (eps_PIT eps) mod final_iface,
eps_PTE = addDeclsToPTE (eps_PTE eps) new_eps_decls,