summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Dammers <tdammers@gmail.com>2018-11-28 11:13:43 +0100
committerBen Gamari <ben@smart-cactus.org>2020-01-27 12:39:49 -0500
commit91699def9f7e237cf824a643d3bcf9835bb9ddc6 (patch)
tree5576cae321d4a4e0a37b4a819caac1d3cb12aa9a
parent9bcceb98426126d22dcbda6bee890bdbcad9ce33 (diff)
downloadhaskell-wip/with.tar.gz
Remove NOINLINE on allocaBytes... functionswip/with
These pragmas were needed as a hack, to prevent dead code elimination from snatching away touch#; but now that we have rewritten these functions using with#, this is no longer necessary.
-rw-r--r--libraries/base/Foreign/Marshal/Alloc.hs19
1 files changed, 1 insertions, 18 deletions
diff --git a/libraries/base/Foreign/Marshal/Alloc.hs b/libraries/base/Foreign/Marshal/Alloc.hs
index aaf6912a63..94a5363f0d 100644
--- a/libraries/base/Foreign/Marshal/Alloc.hs
+++ b/libraries/base/Foreign/Marshal/Alloc.hs
@@ -99,7 +99,7 @@ calloc = callocBytes (sizeOf (undefined :: a))
mallocBytes :: Int -> IO (Ptr a)
mallocBytes size = failWhenNULL "malloc" (_malloc (fromIntegral size))
--- |Llike 'mallocBytes' but memory is filled with bytes of value zero.
+-- |Like 'mallocBytes' but memory is filled with bytes of value zero.
--
callocBytes :: Int -> IO (Ptr a)
callocBytes size = failWhenNULL "calloc" $ _calloc 1 (fromIntegral size)
@@ -116,19 +116,6 @@ alloca :: forall a b . Storable a => (Ptr a -> IO b) -> IO b
alloca =
allocaBytesAligned (sizeOf (undefined :: a)) (alignment (undefined :: a))
--- Note [NOINLINE for touch#]
--- ~~~~~~~~~~~~~~~~~~~~~~~~~~
--- Both allocaBytes and allocaBytesAligned use the touch#, which is notoriously
--- fragile in the presence of simplification (see #14346). In particular, the
--- simplifier may drop the continuation containing the touch# if it can prove
--- that the action passed to allocaBytes will not return. The hack introduced to
--- fix this for 8.2.2 is to mark allocaBytes as NOINLINE, ensuring that the
--- simplifier can't see the divergence.
---
--- These can be removed once #14375 is fixed, which suggests that we instead do
--- away with touch# in favor of a primitive that will capture the scoping left
--- implicit in the case of touch#.
-
-- |@'allocaBytes' n f@ executes the computation @f@, passing as argument
-- a pointer to a temporarily allocated block of memory of @n@ bytes.
-- The block of memory is sufficiently aligned for any of the basic
@@ -145,8 +132,6 @@ allocaBytes (I# size) action = IO $ \ s0 ->
case action addr of { IO action' ->
with# barr# action' s2
}}}
--- See Note [NOINLINE for touch#]
-{-# NOINLINE allocaBytes #-}
allocaBytesAligned :: Int -> Int -> (Ptr a -> IO b) -> IO b
allocaBytesAligned (I# size) (I# align) action = IO $ \ s0 ->
@@ -156,8 +141,6 @@ allocaBytesAligned (I# size) (I# align) action = IO $ \ s0 ->
case action addr of { IO action' ->
with# barr# action' s2
}}}
--- See Note [NOINLINE for touch#]
-{-# NOINLINE allocaBytesAligned #-}
-- |Resize a memory area that was allocated with 'malloc' or 'mallocBytes'
-- to the size needed to store values of type @b@. The returned pointer