summaryrefslogtreecommitdiff
path: root/compiler/simplCore
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2013-01-30 14:29:20 +0000
committerSimon Peyton Jones <simonpj@microsoft.com>2013-01-30 14:29:20 +0000
commitdd86634af16956f555b228948acc578d678219b4 (patch)
tree314422e13d45aa53f09092064e2f9e2a57697342 /compiler/simplCore
parent677144b858f4a425e77399bdfbfcd43dbabd1488 (diff)
parent9c6dd15b206bddc860a537cc059284ba4b6aa80f (diff)
downloadhaskell-dd86634af16956f555b228948acc578d678219b4.tar.gz
Merge branch 'master' of http://darcs.haskell.org/ghc
Conflicts: compiler/types/Coercion.lhs
Diffstat (limited to 'compiler/simplCore')
-rw-r--r--compiler/simplCore/OccurAnal.lhs4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/simplCore/OccurAnal.lhs b/compiler/simplCore/OccurAnal.lhs
index db652c38f4..63d3329c9b 100644
--- a/compiler/simplCore/OccurAnal.lhs
+++ b/compiler/simplCore/OccurAnal.lhs
@@ -710,7 +710,7 @@ occAnalRec :: SCC (Node Details)
occAnalRec (AcyclicSCC (ND { nd_bndr = bndr, nd_rhs = rhs, nd_uds = rhs_uds}, _, _))
(body_uds, binds)
| not (bndr `usedIn` body_uds)
- = (body_uds, binds)
+ = (body_uds, binds) -- See Note [Dead code]
| otherwise -- It's mentioned in the body
= (body_uds' +++ rhs_uds,
@@ -722,7 +722,7 @@ occAnalRec (AcyclicSCC (ND { nd_bndr = bndr, nd_rhs = rhs, nd_uds = rhs_uds}, _,
-- See Note [Loop breaking]
occAnalRec (CyclicSCC nodes) (body_uds, binds)
| not (any (`usedIn` body_uds) bndrs) -- NB: look at body_uds, not total_uds
- = (body_uds, binds) -- Dead code
+ = (body_uds, binds) -- See Note [Dead code]
| otherwise -- At this point we always build a single Rec
= -- pprTrace "occAnalRec" (vcat