diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/ghci/Linker.hs | 4 | ||||
| -rw-r--r-- | compiler/main/DynFlags.hs | 10 | ||||
| -rw-r--r-- | compiler/typecheck/TcCanonical.hs | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/compiler/ghci/Linker.hs b/compiler/ghci/Linker.hs index b3135e1d2b..ace2c702b2 100644 --- a/compiler/ghci/Linker.hs +++ b/compiler/ghci/Linker.hs @@ -115,7 +115,7 @@ readPLS dl = modifyMbPLS_ :: DynLinker -> (Maybe PersistentLinkerState -> IO (Maybe PersistentLinkerState)) -> IO () -modifyMbPLS_ dl f = modifyMVar_ (dl_mpls dl) f +modifyMbPLS_ dl f = modifyMVar_ (dl_mpls dl) f emptyPLS :: DynFlags -> PersistentLinkerState emptyPLS _ = PersistentLinkerState { @@ -350,7 +350,7 @@ linkCmdLineLibs' hsc_env pls = in nub $ map normalise paths let lib_paths = nub $ lib_paths_base ++ gcc_paths all_paths_env <- addEnvPaths "LD_LIBRARY_PATH" all_paths - traceM "all_paths" (ppr all_paths_env) + pprTraceM "all_paths" (ppr all_paths_env) pathCache <- mapM (addLibrarySearchPath hsc_env) all_paths_env pls1 <- foldM (preloadLib hsc_env lib_paths framework_paths) pls diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index e94798aede..52843b4cb0 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -2812,7 +2812,7 @@ parseDynamicFlagsFull activeFlags cmdline dflags0 args = do let (dflags5, consistency_warnings) = makeDynFlagsConsistent dflags4 -- Set timer stats & heap size - when (enableTimeStats dflags5) $ liftIO enableTimingStats +-- when (enableTimeStats dflags5) $ liftIO enableTimingStats case (ghcHeapSize dflags5) of Just x -> liftIO (setHeapSize x) _ -> return () @@ -5967,8 +5967,12 @@ decodeSize str n = readRational m pred c = isDigit c || c == '.' -foreign import ccall unsafe "setHeapSize" setHeapSize :: Int -> IO () -foreign import ccall unsafe "enableTimingStats" enableTimingStats :: IO () +setHeapSize :: Int -> IO () +setHeapSize _ = return () +enableTimingStats :: IO () +enableTimingStats = return () +--foreign import ccall unsafe "setHeapSize" setHeapSize :: Int -> IO () +--foreign import ccall unsafe "enableTimingStats" enableTimingStats :: IO () -- ----------------------------------------------------------------------------- -- Types for managing temporary files. diff --git a/compiler/typecheck/TcCanonical.hs b/compiler/typecheck/TcCanonical.hs index 47c4cc807c..2bf4609f85 100644 --- a/compiler/typecheck/TcCanonical.hs +++ b/compiler/typecheck/TcCanonical.hs @@ -2,6 +2,8 @@ module TcCanonical( canonicalize, + canEqNC, + can_eq_nc, unifyDerived, makeSuperClasses, maybeSym, StopOrContinue(..), stopWith, continueWith, |