[commit: ghc] wip/nested-cpr: Fix a lubDmdResult equation (12f88bb)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nested-cpr
Link       : http://ghc.haskell.org/trac/ghc/changeset/12f88bb9aabcc29b890e98be939cd8f591e48c09/ghc

>---------------------------------------------------------------

commit 12f88bb9aabcc29b890e98be939cd8f591e48c09
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Nov 26 10:17:57 2013 +0000

    Fix a lubDmdResult equation


>---------------------------------------------------------------

12f88bb9aabcc29b890e98be939cd8f591e48c09
 compiler/basicTypes/Demand.lhs |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/compiler/basicTypes/Demand.lhs b/compiler/basicTypes/Demand.lhs
index b68c10b..06d6c82 100644
--- a/compiler/basicTypes/Demand.lhs
+++ b/compiler/basicTypes/Demand.lhs
@@ -750,8 +750,10 @@ lubCPR (RetProd ds1) (RetProd ds2)
 lubCPR _ _                         = NoCPR
 
 lubDmdResult :: DmdResult -> DmdResult -> DmdResult
-lubDmdResult Diverges       r              = r
-lubDmdResult (Converges c1) Diverges       = Converges c1
+lubDmdResult Diverges       (Dunno c2)     = Dunno c2
+lubDmdResult Diverges       Diverges       = Diverges
+lubDmdResult Diverges       (Converges c2) = Dunno c2
+lubDmdResult (Converges c1) Diverges       = Dunno c1
 lubDmdResult (Converges c1) (Converges c2) = Converges (c1 `lubCPR` c2)
 lubDmdResult (Converges c1) (Dunno c2)     = Dunno (c1 `lubCPR` c2)
 lubDmdResult (Dunno c1)     Diverges       = Dunno c1