diff options
| author | simonpj <unknown> | 1999-07-06 16:46:12 +0000 |
|---|---|---|
| committer | simonpj <unknown> | 1999-07-06 16:46:12 +0000 |
| commit | 9d38678ea60ff32f756390a30c659daa22c98c93 (patch) | |
| tree | 520970e39a3c81cdeb22271b83e576e726abdb37 /ghc/lib/exts | |
| parent | 47a40c89ca2e588b62d986a58907e178bce1de4f (diff) | |
| download | haskell-9d38678ea60ff32f756390a30c659daa22c98c93.tar.gz | |
[project @ 1999-07-06 16:45:31 by simonpj]
All Simon's recent tuning changes. Rough summary follows:
* Fix Kevin Atkinson's cant-find-instance bug. Turns out that Rename.slurpSourceRefs
needs to repeatedly call getImportedInstDecls, and then go back to slurping
source-refs. Comments with Rename.slurpSourceRefs.
* Add a case to Simplify.mkDupableAlt for the quite-common case where there's
a very simple alternative, in which case there's no point in creating a
join-point binding.
* Fix CoreUtils.exprOkForSpeculation so that it returns True of (==# a# b#).
This lack meant that
case ==# a# b# of { True -> x; False -> x }
was not simplifying
* Make float-out dump bindings at the top of a function argument, as
at the top of a let(rec) rhs. See notes with FloatOut.floatRhs
* Make the ArgOf case of mkDupableAlt generate a OneShot lambda.
This gave a noticeable boost to spectral/boyer2
* Reduce the number of coerces, using worker/wrapper stuff.
The main idea is in WwLib.mkWWcoerce. The gloss is that we must do
the w/w split even for small non-recursive things. See notes with
WorkWrap.tryWw.
* This further complicated getWorkerId, so I finally bit the bullet and
make the workerInfo field of the IdInfo work properly, including
under substitutions. Death to getWorkerId. Kevin Glynn will be happy.
* Make all lambdas over realWorldStatePrimTy
into one-shot lambdas. This is a GROSS HACK.
* Also make the occurrence analyser aware of one-shot lambdas.
* Make various Prelude things into INLINE, so that foldr doesn't
get inlined in their body, so that the caller gets the benefit
of fusion. Notably in PrelArr.lhs.
Diffstat (limited to 'ghc/lib/exts')
| -rw-r--r-- | ghc/lib/exts/GetOpt.lhs | 2 | ||||
| -rw-r--r-- | ghc/lib/exts/MutableArray.lhs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ghc/lib/exts/GetOpt.lhs b/ghc/lib/exts/GetOpt.lhs index f8c4646953..2a934dfc7f 100644 --- a/ghc/lib/exts/GetOpt.lhs +++ b/ghc/lib/exts/GetOpt.lhs @@ -125,7 +125,7 @@ shortOpt x xs rest optDescr = short ads xs rest short (_:_:_) _ rest = (errAmbig options optStr,rest) short (NoArg a :_) [] rest = (Opt a,rest) short (NoArg a :_) xs rest = (Opt a,('-':xs):rest) - short (ReqArg f d:_) [] [] = (errReq d optStr,[]) + short (ReqArg _ d:_) [] [] = (errReq d optStr,[]) short (ReqArg f _:_) [] (r:rest) = (Opt (f r),rest) short (ReqArg f _:_) xs rest = (Opt (f xs),rest) short (OptArg f _:_) [] rest = (Opt (f Nothing),rest) diff --git a/ghc/lib/exts/MutableArray.lhs b/ghc/lib/exts/MutableArray.lhs index 205d71c7b5..7c8698228c 100644 --- a/ghc/lib/exts/MutableArray.lhs +++ b/ghc/lib/exts/MutableArray.lhs @@ -327,7 +327,7 @@ writeInt16Array (MutableByteArray ixs arr#) n i = ST $ \ s# -> (# s2# , v# #) -> let w' = word2Int# (int2Word# i# `or#` (int2Word# v# `and#` mask)) in - case writeIntArray# arr# (n# `quotInt#` 2#) w' s# of + case writeIntArray# arr# (n# `quotInt#` 2#) w' s2# of s2# -> (# s2# , () #) writeInt32Array (MutableByteArray ixs arr#) n i = ST $ \ s# -> |