diff options
| author | Ryan Scott <ryan.gl.scott@gmail.com> | 2021-03-05 19:13:39 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-03-09 02:46:20 -0500 |
| commit | 0a709dd9876e40c19c934692415c437ac434318c (patch) | |
| tree | 0ac02b3eb1d1397cf0bfa495c84b0ff2e8834bde /libraries/ghc-heap | |
| parent | bfa862503a9f8b2e8a61b9499d2cc3be789779fd (diff) | |
| download | haskell-0a709dd9876e40c19c934692415c437ac434318c.tar.gz | |
Require GHC 8.10 as the minimum compiler for bootstrapping
Now that GHC 9.0.1 is released, it is time to drop support for bootstrapping
with GHC 8.8, as we only support building with the previous two major GHC
releases. As an added bonus, this allows us to remove several bits of CPP that
are either always true or no longer reachable.
Diffstat (limited to 'libraries/ghc-heap')
| -rw-r--r-- | libraries/ghc-heap/GHC/Exts/Heap.hs | 7 | ||||
| -rw-r--r-- | libraries/ghc-heap/GHC/Exts/Heap/Closures.hs | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/libraries/ghc-heap/GHC/Exts/Heap.hs b/libraries/ghc-heap/GHC/Exts/Heap.hs index 1e429ca054..2906cf6926 100644 --- a/libraries/ghc-heap/GHC/Exts/Heap.hs +++ b/libraries/ghc-heap/GHC/Exts/Heap.hs @@ -153,14 +153,7 @@ getClosureDataFromHeapObject -- ^ Heap representation of the closure. getClosureDataFromHeapObject x = do case unpackClosure# x of -#if MIN_VERSION_ghc_prim(0,5,3) (# infoTableAddr, heapRep, pointersArray #) -> do -#else - -- This is a hack to cover the bootstrap compiler using the old version - -- of 'unpackClosure'. The new 'unpackClosure' return values are not - -- merely a reordering, so using the old version would not work. - (# infoTableAddr, pointersArray, heapRep #) -> do -#endif let infoTablePtr = Ptr infoTableAddr ptrList = [case indexArray# pointersArray i of (# ptr #) -> Box ptr diff --git a/libraries/ghc-heap/GHC/Exts/Heap/Closures.hs b/libraries/ghc-heap/GHC/Exts/Heap/Closures.hs index 1a6a9371d4..3b51b22ceb 100644 --- a/libraries/ghc-heap/GHC/Exts/Heap/Closures.hs +++ b/libraries/ghc-heap/GHC/Exts/Heap/Closures.hs @@ -16,12 +16,7 @@ module GHC.Exts.Heap.Closures ( , WhyBlocked(..) , TsoFlags(..) , allClosures -#if __GLASGOW_HASKELL__ >= 809 - -- The closureSize# primop is unsupported on earlier GHC releases but we - -- build ghc-heap as a boot library so it must be buildable. Drop this once - -- we are guaranteed to bootstsrap with GHC >= 8.9. , closureSize -#endif -- * Boxes , Box(..) @@ -430,11 +425,9 @@ allClosures (WeakClosure {..}) = [cfinalizers, key, value, finalizer, link] allClosures (OtherClosure {..}) = hvalues allClosures _ = [] -#if __GLASGOW_HASKELL__ >= 809 -- | Get the size of the top-level closure in words. -- Includes header and payload. Does not follow pointers. -- -- @since 8.10.1 closureSize :: Box -> Int closureSize (Box x) = I# (closureSize# x) -#endif |