From: simonpj <unknown>
Date: Tue, 23 Oct 2001 08:58:30 +0000 (+0000)
Subject: [project @ 2001-10-23 08:58:30 by simonpj]
X-Git-Tag: Approximately_9120_patches~754
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=32eebc97911a3bcb6f1c5c53757473d139788f6b

[project @ 2001-10-23 08:58:30 by simonpj]
-------------------------------
	Correct a nasty lub bug
	-------------------------------

	MERGE WITH STABLE BRANCH

Peter Sestoft discovered that lub wasn't commutative.
We certainly want that

	Err `lub` Abs = Lazy

This is a Real Bug.
---

diff --git a/ghc/compiler/stranal/DmdAnal.lhs b/ghc/compiler/stranal/DmdAnal.lhs
index 11071d4..a28b4b5 100644
--- a/ghc/compiler/stranal/DmdAnal.lhs
+++ b/ghc/compiler/stranal/DmdAnal.lhs
@@ -791,6 +791,7 @@ lub :: Demand -> Demand -> Demand
 lub Bot d = d
 
 lub Err Bot = Err 
+lub Err Abs = Lazy	-- E.g. f x = if ... then True else error x
 lub Err d   = d 
 
 lub Lazy d = Lazy