X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FGHC.hs;h=5626d249e0bb33af952f44984b38eac97f200ff9;hb=2377596a0f1992347edbaa7dcd8b431f93e196a7;hp=f08b613555b2c2a68390f98fe9cfa85960a8953c;hpb=2a83a2aa7b6213e6fc5df909012e272445efd476;p=ghc-hetmet.git

diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
index f08b613..5626d24 100644
--- a/compiler/main/GHC.hs
+++ b/compiler/main/GHC.hs
@@ -542,7 +542,7 @@ data LoadHowMuch
 -- attempt to load up to this target.  If no Module is supplied,
 -- then try to load all targets.
 load :: Session -> LoadHowMuch -> IO SuccessFlag
-load s@(Session ref) how_much
+load s how_much
    = do 
 	-- Dependency analysis first.  Note that this fixes the module graph:
 	-- even if we don't get a fully successful upsweep, the full module
@@ -550,15 +550,8 @@ load s@(Session ref) how_much
 	-- were successfully loaded by inspecting the Session's HPT.
 	mb_graph <- depanal s [] False
 	case mb_graph of
-	   Just mod_graph -> catchingFailure $ load2 s how_much mod_graph
+	   Just mod_graph -> load2 s how_much mod_graph
 	   Nothing        -> return Failed
-    where catchingFailure f = f `Exception.catch` \e -> do
-              hsc_env <- readIORef ref
-              -- trac #1565 / test ghci021:
-              -- let bindings may explode if we try to use them after
-              -- failing to reload
-              writeIORef ref $! hsc_env{ hsc_IC = emptyInteractiveContext }
-              throw e
 
 load2 :: Session -> LoadHowMuch -> [ModSummary] -> IO SuccessFlag
 load2 s@(Session ref) how_much mod_graph = do
@@ -578,6 +571,21 @@ load2 s@(Session ref) how_much mod_graph = do
 					not (ms_mod_name s `elem` all_home_mods)]
 	ASSERT( null bad_boot_mods ) return ()
 
+        -- check that the module given in HowMuch actually exists, otherwise
+        -- topSortModuleGraph will bomb later.
+        let checkHowMuch (LoadUpTo m)           = checkMod m
+            checkHowMuch (LoadDependenciesOf m) = checkMod m
+            checkHowMuch _ = id
+
+            checkMod m and_then
+                | m `elem` all_home_mods = and_then
+                | otherwise = do 
+                        errorMsg dflags (text "no such module:" <+> 
+                                         quotes (ppr m))
+                        return Failed
+
+        checkHowMuch how_much $ do
+
         -- mg2_with_srcimps drops the hi-boot nodes, returning a 
 	-- graph with cycles.  Among other things, it is used for
         -- backing out partially complete cycles following a failed
@@ -603,6 +611,12 @@ load2 s@(Session ref) how_much mod_graph = do
 
 	evaluate pruned_hpt
 
+        -- before we unload anything, make sure we don't leave an old
+        -- interactive context around pointing to dead bindings.  Also,
+        -- write the pruned HPT to allow the old HPT to be GC'd.
+        writeIORef ref $! hsc_env{ hsc_IC = emptyInteractiveContext,
+                                   hsc_HPT = pruned_hpt }
+
 	debugTraceMsg dflags 2 (text "Stable obj:" <+> ppr stable_obj $$
 				text "Stable BCO:" <+> ppr stable_bco)
 
@@ -1757,7 +1771,10 @@ summariseFile hsc_env old_summaries file mb_phase maybe_buf
 
 	if ms_hs_date old_summary == src_timestamp 
 	   then do -- update the object-file timestamp
-		  obj_timestamp <- getObjTimestamp location False
+        	  obj_timestamp <-
+                    if isObjectTarget (hscTarget (hsc_dflags hsc_env)) -- #1205
+                        then getObjTimestamp location False
+                        else return Nothing
 		  return old_summary{ ms_obj_date = obj_timestamp }
 	   else
 		new_summary
@@ -1785,7 +1802,12 @@ summariseFile hsc_env old_summaries file mb_phase maybe_buf
 			   Nothing    -> getModificationTime file
 			-- getMofificationTime may fail
 
-	obj_timestamp <- modificationTimeIfExists (ml_obj_file location)
+        -- when the user asks to load a source file by name, we only
+        -- use an object file if -fobject-code is on.  See #1205.
+	obj_timestamp <-
+            if isObjectTarget (hscTarget (hsc_dflags hsc_env))
+                then modificationTimeIfExists (ml_obj_file location)
+                else return Nothing
 
         return (ModSummary { ms_mod = mod, ms_hsc_src = HsSrcFile,
 			     ms_location = location,
@@ -2213,7 +2235,7 @@ findModule s mod_name maybe_pkg = withSession s $ \hsc_env ->
 	  case res of
 	    Found _ m | modulePackageId m /= this_pkg -> return m
 		      | otherwise -> throwDyn (CmdLineError (showSDoc $
-					text "module" <+> pprModule m <+>
+					text "module" <+> quotes (ppr (moduleName m)) <+>
 					text "is not loaded"))
 	    err -> let msg = cannotFindModule dflags mod_name err in
 		   throwDyn (CmdLineError (showSDoc msg))