diff options
| author | Jose Pedro Magalhaes <jpm@cs.uu.nl> | 2011-11-04 10:23:59 +0000 |
|---|---|---|
| committer | Jose Pedro Magalhaes <jpm@cs.uu.nl> | 2011-11-04 10:23:59 +0000 |
| commit | 76bce1b7f5f501626fbaf056e2dd23c6daaed33f (patch) | |
| tree | 0c2236e2c8fdbaf4c70def26bfc186d4505c2f5c | |
| parent | 76b5d7af3c6c916f9662c3b74182ccd4ae25977c (diff) | |
| parent | f699ccb4baef6ad3597451610cd78c3639236f3b (diff) | |
| download | haskell-76bce1b7f5f501626fbaf056e2dd23c6daaed33f.tar.gz | |
Merge branch 'master' of /home/simonmar/ghc-mirror/ghc
| -rw-r--r-- | compiler/deSugar/Coverage.lhs | 3 | ||||
| -rw-r--r-- | compiler/ghci/ByteCodeAsm.lhs | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/compiler/deSugar/Coverage.lhs b/compiler/deSugar/Coverage.lhs index 117e1deb3b..fc28b147fb 100644 --- a/compiler/deSugar/Coverage.lhs +++ b/compiler/deSugar/Coverage.lhs @@ -254,7 +254,8 @@ addTickLHsBind (L pos (funBind@(FunBind { fun_id = (L _ id) }))) = do let simple = isSimplePatBind funBind toplev = null decl_path exported = idName id `elemNameSet` exported_names - inline = pprTrace "inline" (ppr id <+> ppr (idInlinePragma id)) $ isAnyInlinePragma (idInlinePragma id) + inline = {- pprTrace "inline" (ppr id <+> ppr (idInlinePragma id)) $ -} + isAnyInlinePragma (idInlinePragma id) tick <- if not blackListed && shouldTickBind density toplev exported simple inline diff --git a/compiler/ghci/ByteCodeAsm.lhs b/compiler/ghci/ByteCodeAsm.lhs index edd2e8a359..360dffed43 100644 --- a/compiler/ghci/ByteCodeAsm.lhs +++ b/compiler/ghci/ByteCodeAsm.lhs @@ -136,9 +136,6 @@ assembleBCO dflags (ProtoBCO nm instrs bitmap bsize arity _origin _malloced) | otherwise = error "wORD_SIZE_IN_BITS not 32 or 64?" label_env = mkLabelEnv Map.empty lableInitialOffset instrs - n_instrs = length instrs :: Int - max_w16s = fromIntegral n_instrs * maxInstr16s :: Word - -- Jump instructions are variable-sized, there are long and -- short variants depending on the magnitude of the offset. -- However, we can't tell what size instructions we will need @@ -150,7 +147,8 @@ assembleBCO dflags (ProtoBCO nm instrs bitmap bsize arity _origin _malloced) -- or short. -- True => all our jumps will be long - large_bco = if isLarge max_w16s then pprTrace "assembleBCO" (text "LARGE!") True else False + large_bco = isLarge max_w16s + where max_w16s = fromIntegral (length instrs) * maxInstr16s :: Word mkLabelEnv :: Map Word16 Word -> Word -> [BCInstr] -> Map Word16 Word |