Skip to content

Limit use of unboxed elements from array access #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 26, 2021
Merged

Limit use of unboxed elements from array access #354

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Data/ByteString/Builder/Prim.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,7 @@ import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)
#else
import Foreign
#endif
import GHC.Word (Word8 (..))
import GHC.Exts
import GHC.IO

Expand Down Expand Up @@ -693,7 +694,7 @@ cstring =
where
step :: Addr# -> BuildStep r -> BuildStep r
step !addr !k br@(BufferRange op0@(Ptr op0#) ope)
| isTrue# (ch `eqWord#` 0##) = k br
| W8# ch == 0 = k br
| op0 == ope =
return $ bufferFull defaultChunkSize op0 (step addr k)
| otherwise = do
Expand All @@ -712,13 +713,14 @@ cstringUtf8 =
where
step :: Addr# -> BuildStep r -> BuildStep r
step !addr !k br@(BufferRange op0@(Ptr op0#) ope)
| isTrue# (ch `eqWord#` 0##) = k br
| W8# ch == 0 = k br
| op0 == ope =
return $ bufferFull defaultChunkSize op0 (step addr k)
-- NULL is encoded as 0xc0 0x80
| isTrue# (ch `eqWord#` 0xc0##)
, isTrue# (indexWord8OffAddr# addr 1# `eqWord#` 0x80##) = do
IO $ \s -> case writeWord8OffAddr# op0# 0# 0## s of
| W8# ch == 0xc0
, W8# (indexWord8OffAddr# addr 1#) == 0x80 = do
let !(W8# nullByte#) = 0
IO $ \s -> case writeWord8OffAddr# op0# 0# nullByte# s of
s' -> (# s', () #)
let br' = BufferRange (op0 `plusPtr` 1) ope
step (addr `plusAddr#` 2#) k br'
Expand Down