summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsewardj <unknown>2000-01-31 14:25:34 +0000
committersewardj <unknown>2000-01-31 14:25:34 +0000
commit4b1f1a3bb57c3cb7016bdb6028719c3f53813579 (patch)
tree423c53c3e035bdd0dba66016ca14f5ed8fdbc05a
parenta105d60ec8bc322aec0a319dba440e93cc28db6d (diff)
downloadhaskell-4b1f1a3bb57c3cb7016bdb6028719c3f53813579.tar.gz
[project @ 2000-01-31 14:25:34 by sewardj]
Change primOpUsg(CatchOp) to reflect changed arity of catch#. Also update primOpStrictness(CatchOp).
-rw-r--r--ghc/compiler/prelude/PrimOp.lhs4
1 files changed, 2 insertions, 2 deletions
diff --git a/ghc/compiler/prelude/PrimOp.lhs b/ghc/compiler/prelude/PrimOp.lhs
index c514f02c72..0c7461eb76 100644
--- a/ghc/compiler/prelude/PrimOp.lhs
+++ b/ghc/compiler/prelude/PrimOp.lhs
@@ -933,7 +933,7 @@ primOpStrictness WriteMutVarOp = ([wwPrim, wwLazy, wwPrim], False)
primOpStrictness PutMVarOp = ([wwPrim, wwLazy, wwPrim], False)
-primOpStrictness CatchOp = ([wwLazy, wwLazy], False)
+primOpStrictness CatchOp = ([wwStrict, wwLazy, wwPrim], False)
primOpStrictness RaiseOp = ([wwLazy], True) -- NB: True => result is bottom
primOpStrictness BlockAsyncExceptionsOp = ([wwLazy], False)
primOpStrictness UnblockAsyncExceptionsOp = ([wwLazy], False)
@@ -2286,7 +2286,7 @@ primOpUsg op
SameMutVarOp -> mangle [mkP, mkP ] mkM
CatchOp -> -- [mkO, mkO . (inFun mkM mkO)] mkO
- mangle [mkM, mkM . (inFun mkM mkM)] mkM
+ mangle [mkM, mkM . (inFun mkM mkM), mkP] mkM
-- might use caught action multiply
RaiseOp -> mangle [mkM ] mkM