X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FGHC.hs;h=44ec3ff26bc4c4a4c6b2f3bd3aa2b56f97a904ac;hp=2480e28255743886f6c500f4bdad8c595e0edc72;hb=b2524b3960999fffdb3767900f58825903f6560f;hpb=6f9127b3a48638a1230935d94046084db567699e

diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
index 2480e28..44ec3ff 100644
--- a/compiler/main/GHC.hs
+++ b/compiler/main/GHC.hs
@@ -171,7 +171,7 @@ module GHC (
 	pprParendType, pprTypeApp, 
 	Kind,
 	PredType,
-	ThetaType, pprForAll, pprThetaArrow,
+	ThetaType, pprForAll, pprThetaArrow, pprThetaArrowTy,
 
 	-- ** Entities
 	TyThing(..), 
@@ -256,7 +256,6 @@ import Type
 import Coercion		( synTyConResKind )
 import TcType		hiding( typeKind )
 import Id
-import Var
 import TysPrim		( alphaTyVars )
 import TyCon
 import Class
@@ -388,7 +387,7 @@ runGhc :: Maybe FilePath  -- ^ See argument to 'initGhcMonad'.
        -> Ghc a           -- ^ The action to perform.
        -> IO a
 runGhc mb_top_dir ghc = do
-  ref <- newIORef undefined
+  ref <- newIORef (panic "empty session")
   let session = Session ref
   flip unGhc session $ do
     initGhcMonad mb_top_dir
@@ -406,7 +405,7 @@ runGhcT :: (ExceptionMonad m, Functor m, MonadIO m) =>
         -> GhcT m a        -- ^ The action to perform.
         -> m a
 runGhcT mb_top_dir ghct = do
-  ref <- liftIO $ newIORef undefined
+  ref <- liftIO $ newIORef (panic "empty session")
   let session = Session ref
   flip unGhcT session $ do
     initGhcMonad mb_top_dir
@@ -431,9 +430,8 @@ initGhcMonad mb_top_dir = do
 
   liftIO $ StaticFlags.initStaticOpts
 
-  dflags0 <- liftIO $ initDynFlags defaultDynFlags
   mySettings <- liftIO $ initSysTools mb_top_dir
-  let dflags = dflags0 { settings = mySettings }
+  dflags <- liftIO $ initDynFlags (defaultDynFlags mySettings)
   env <- liftIO $ newHscEnv dflags
   setSession env