tibbe avatar tibbe committed 5c2f537

Workaround for inliner problem

The rewrite rules makes GHC think writeN (and ensureFree) are
recursive so no unfolding would be generated for them.

Comments (0)

Files changed (1)

Data/Text/Lazy/Builder.hs

 ensureFree !n = withSize $ \ l ->
     if n <= l
     then empty
-    else flush `append` withBuffer (const (newBuffer (max n defaultChunkSize)))
+    else flush `append'` withBuffer (const (newBuffer (max n defaultChunkSize)))
 {-# INLINE [1] ensureFree #-}
 
 -- | Ensure that @n@ many elements are available, and then use @f@ to
 -- write some elements into the memory.
 writeN :: Int -> (forall s. A.MArray s Word16 -> Int -> ST s ()) -> Builder
-writeN n f = ensureFree 1 `append` withBuffer (writeNBuffer n f)
+writeN n f = ensureFree 1 `append'` withBuffer (writeNBuffer n f)
 {-# INLINE [1] writeN #-}
 
 writeNBuffer :: Int -> (A.MArray s Word16 -> Int -> ST s ()) -> (Buffer s)
 ------------------------------------------------------------------------
 -- Some nice rules for Builder
 
+-- This function makes GHC understand that 'writeN' and 'ensureFree'
+-- are *not* recursive in the precense of the rewrite rules below.
+-- This is not needed with GHC 6.14+.
+append' :: Builder -> Builder -> Builder
+append' (Builder f) (Builder g) = Builder (f . g)
+{-# INLINE append' #-}
+
 {-# RULES
 
 "writeN/combine" forall a b (f::forall s. A.MArray s Word16 -> Int -> ST s ())
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.