X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FGHC.hs;h=eabcafcaf436e93985c9ad7709b58a0c39df6293;hb=dfcbc18e016540cb136ec3298a07a4a55b488db0;hp=c786cbba1616b4bde39e3d77be45cdaca4e6d695;hpb=b00b5bc04ff36a551552470060064f0b7d84ca30;p=ghc-hetmet.git

diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
index c786cbb..eabcafc 100644
--- a/compiler/main/GHC.hs
+++ b/compiler/main/GHC.hs
@@ -333,7 +333,7 @@ newSession :: GhcMode -> Maybe FilePath -> IO Session
 newSession mode mb_top_dir = do
   -- catch ^C
   main_thread <- myThreadId
-  putMVar interruptTargetThread [main_thread]
+  modifyMVar_ interruptTargetThread (return . (main_thread :))
   installSignalHandlers
 
   dflags0 <- initSysTools mb_top_dir defaultDynFlags
@@ -1756,15 +1756,15 @@ getModuleInfo s mdl = withSession s $ \hsc_env -> do
 getPackageModuleInfo :: HscEnv -> Module -> IO (Maybe ModuleInfo)
 getPackageModuleInfo hsc_env mdl = do
 #ifdef GHCI
-  (_msgs, mb_names) <- getModuleExports hsc_env mdl
-  case mb_names of
+  (_msgs, mb_avails) <- getModuleExports hsc_env mdl
+  case mb_avails of
     Nothing -> return Nothing
-    Just names -> do
+    Just avails -> do
 	eps <- readIORef (hsc_EPS hsc_env)
 	let 
+            names  = availsToNameSet avails
 	    pte    = eps_PTE eps
-	    n_list = nameSetToList names
-	    tys    = [ ty | name <- n_list,
+	    tys    = [ ty | name <- concatMap availNames avails,
 			    Just ty <- [lookupTypeEnv pte name] ]
 	--
 	return (Just (ModuleInfo {
@@ -1925,8 +1925,8 @@ mkExportEnv hsc_env mods = do
   stuff <- mapM (getModuleExports hsc_env) mods
   let 
 	(_msgs, mb_name_sets) = unzip stuff
-	gres = [ nameSetToGlobalRdrEnv name_set (moduleName mod)
-  	       | (Just name_set, mod) <- zip mb_name_sets mods ]
+	gres = [ nameSetToGlobalRdrEnv (availsToNameSet avails) (moduleName mod)
+  	       | (Just avails, mod) <- zip mb_name_sets mods ]
   --
   return $! foldr plusGlobalRdrEnv emptyGlobalRdrEnv gres