X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Futils%2FFastMutInt.lhs;h=26183071f15c2622b5d5cd8ad7eafd5612822535;hp=00aba34bbaf9fab4e08b430c1674e32a464a6901;hb=edc0bafd3fcd01b85a2e8894e5dfe149eb0e0857;hpb=526c3af1dc98987b6949f4df73c0debccf9875bd

diff --git a/compiler/utils/FastMutInt.lhs b/compiler/utils/FastMutInt.lhs
index 00aba34..2618307 100644
--- a/compiler/utils/FastMutInt.lhs
+++ b/compiler/utils/FastMutInt.lhs
@@ -1,10 +1,15 @@
+\begin{code}
+{-# LANGUAGE BangPatterns #-}
 {-# OPTIONS -cpp #-}
+{-# OPTIONS_GHC -O #-}
+-- We always optimise this, otherwise performance of a non-optimised
+-- compiler is severely affected
+
 --
 -- (c) The University of Glasgow 2002-2006
 --
 -- Unboxed mutable Ints
 
-\begin{code}
 module FastMutInt(
 	FastMutInt, newFastMutInt,
 	readFastMutInt, writeFastMutInt,
@@ -15,13 +20,12 @@ module FastMutInt(
 
 #ifdef __GLASGOW_HASKELL__
 
-#include "MachDeps.h"
+#include "../includes/MachDeps.h"
 #ifndef SIZEOF_HSINT
 #define SIZEOF_HSINT  INT_SIZE_IN_BYTES
 #endif
 
 import GHC.Base
-import GHC.IOBase
 import GHC.Ptr
 
 #else /* ! __GLASGOW_HASKELL__ */
@@ -46,7 +50,7 @@ data FastMutInt = FastMutInt (MutableByteArray# RealWorld)
 newFastMutInt = IO $ \s ->
   case newByteArray# size s of { (# s, arr #) ->
   (# s, FastMutInt arr #) }
-  where I# size = SIZEOF_HSINT
+  where !(I# size) = SIZEOF_HSINT
 
 readFastMutInt (FastMutInt arr) = IO $ \s ->
   case readIntArray# arr 0# s of { (# s, i #) ->
@@ -61,7 +65,7 @@ data FastMutPtr = FastMutPtr (MutableByteArray# RealWorld)
 newFastMutPtr = IO $ \s ->
   case newByteArray# size s of { (# s, arr #) ->
   (# s, FastMutPtr arr #) }
-  where I# size = SIZEOF_VOID_P
+  where !(I# size) = SIZEOF_VOID_P
 
 readFastMutPtr (FastMutPtr arr) = IO $ \s ->
   case readAddrArray# arr 0# s of { (# s, i #) ->