summaryrefslogtreecommitdiff
path: root/compiler/utils
diff options
context:
space:
mode:
Diffstat (limited to 'compiler/utils')
-rw-r--r--compiler/utils/FastTypes.lhs10
1 files changed, 8 insertions, 2 deletions
diff --git a/compiler/utils/FastTypes.lhs b/compiler/utils/FastTypes.lhs
index bcea61de78..9d7c276c22 100644
--- a/compiler/utils/FastTypes.lhs
+++ b/compiler/utils/FastTypes.lhs
@@ -34,6 +34,8 @@ fastBool True = 1#
fastBool False = 0#
isFastTrue x = x ==# 1#
+-- note that fastOr and fastAnd are strict in both arguments
+-- since they are unboxed
fastOr 1# _ = 1#
fastOr 0# x = x
@@ -60,8 +62,12 @@ negateFastInt = negate
type FastBool = Bool
fastBool x = x
isFastTrue x = x
-fastOr = (||)
-fastAnd = (&&)
+-- make sure these are as strict as the unboxed version,
+-- so that the performance characteristics match
+fastOr False False = False
+fastOr _ _ = True
+fastAnd True True = True
+fastAnd _ _ = False
--These are among the type-signatures necessary for !ghc to compile
-- but break ghc (can't give a signature for an import...)