diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-11-19 11:43:30 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-12-03 07:11:33 -0500 |
| commit | 705a16df02411ec2445c9a254396a93cabe559ef (patch) | |
| tree | aae70d73be2d785fd85951ef3813673f2b37e695 /libraries/ghc-heap | |
| parent | 5a4b8d0cf2ff83d1a04826b9624fffec7b9a5683 (diff) | |
| download | haskell-705a16df02411ec2445c9a254396a93cabe559ef.tar.gz | |
Make BCO# lifted
In #17424 Simon PJ noted that there is a potentially unsafe occurrence
of unsafeCoerce#, coercing from an unlifted to lifted type. However,
nowhere in the compiler do we assume that a BCO# is not a thunk.
Moreover, in the case of a CAF the result returned by `createBCO` *will*
be a thunk (as noted in [Updatable CAF BCOs]). Consequently it seems
better to rather make BCO# a lifted type and rename it to BCO.
Diffstat (limited to 'libraries/ghc-heap')
| -rw-r--r-- | libraries/ghc-heap/tests/closure_size.hs | 1 | ||||
| -rw-r--r-- | libraries/ghc-heap/tests/heap_all.hs | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/libraries/ghc-heap/tests/closure_size.hs b/libraries/ghc-heap/tests/closure_size.hs index d760f22efa..85d860fbf4 100644 --- a/libraries/ghc-heap/tests/closure_size.hs +++ b/libraries/ghc-heap/tests/closure_size.hs @@ -12,7 +12,6 @@ data A = A (Array# Int) data MA = MA (MutableArray# RealWorld Int) data BA = BA ByteArray# data MBA = MBA (MutableByteArray# RealWorld) -data B = B BCO# data APC a = APC a diff --git a/libraries/ghc-heap/tests/heap_all.hs b/libraries/ghc-heap/tests/heap_all.hs index 1560d4d9e8..fa536a2d30 100644 --- a/libraries/ghc-heap/tests/heap_all.hs +++ b/libraries/ghc-heap/tests/heap_all.hs @@ -197,7 +197,6 @@ data A = A (Array# Int) data MA = MA (MutableArray# RealWorld Int) data BA = BA ByteArray# data MBA = MBA (MutableByteArray# RealWorld) -data B = B BCO# data APC a = APC a main :: IO () @@ -220,9 +219,8 @@ main = do (# s1, x #) -> case unsafeFreezeByteArray# x s1 of (# s2, y #) -> (# s2, BA y #) - B bco <- IO $ \s -> - case newBCO# ba ba a 0# ba s of - (# s1, x #) -> (# s1, B x #) + bco <- IO $ \s -> + newBCO# ba ba a 0# ba s APC apc <- IO $ \s -> case mkApUpd0# bco of (# x #) -> (# s, APC x #) |