diff options
| author | Ömer Sinan Ağacan <omeragacan@gmail.com> | 2018-11-16 13:52:11 +0300 |
|---|---|---|
| committer | Ömer Sinan Ağacan <omeragacan@gmail.com> | 2018-11-16 13:52:33 +0300 |
| commit | a50a59a9603425fafb1fac33addb201c19546808 (patch) | |
| tree | 228f87fd6e76edf2ec62a402324e47577ab0ed03 /libraries/base | |
| parent | 4efd1b487e10c8cdbc1bca10c45f0887642a5c48 (diff) | |
| download | haskell-a50a59a9603425fafb1fac33addb201c19546808.tar.gz | |
More efficient, non-allocating unsafeLookupStaticPtr
We now allocate the key to spt on C stack rather than in Haskell heap,
avoiding allocating in `unsafeLookupStaticPtr`. This should be slightly
more efficient.
Test Plan: Validated locally
Reviewers: simonmar, hvr, bgamari, erikd
Reviewed By: simonmar
Subscribers: rwbarton, carter
Differential Revision: https://phabricator.haskell.org/D5333
Diffstat (limited to 'libraries/base')
| -rw-r--r-- | libraries/base/GHC/StaticPtr.hs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libraries/base/GHC/StaticPtr.hs b/libraries/base/GHC/StaticPtr.hs index 42ca0927dc..14ff3e0b2d 100644 --- a/libraries/base/GHC/StaticPtr.hs +++ b/libraries/base/GHC/StaticPtr.hs @@ -48,8 +48,7 @@ module GHC.StaticPtr ) where import Foreign.C.Types (CInt(..)) -import Foreign.Marshal (allocaArray, peekArray, withArray) -import Foreign.Ptr (castPtr) +import Foreign.Marshal (allocaArray, peekArray) import GHC.Exts (addrToAny#) import GHC.Ptr (Ptr(..), nullPtr) import GHC.Fingerprint (Fingerprint(..)) @@ -89,13 +88,13 @@ staticKey (StaticPtr w0 w1 _ _) = Fingerprint (W64# w0) (W64# w1) -- unsafeLookupStaticPtr :: StaticKey -> IO (Maybe (StaticPtr a)) unsafeLookupStaticPtr (Fingerprint w1 w2) = do - ptr@(Ptr addr) <- withArray [w1,w2] (hs_spt_lookup . castPtr) + ptr@(Ptr addr) <- hs_spt_lookup w1 w2 if (ptr == nullPtr) then return Nothing else case addrToAny# addr of (# spe #) -> return (Just spe) -foreign import ccall unsafe hs_spt_lookup :: Ptr () -> IO (Ptr a) +foreign import ccall unsafe hs_spt_lookup :: Word64 -> Word64 -> IO (Ptr a) -- | A class for things buildable from static pointers. class IsStatic p where |