[Git][ghc/ghc][wip/ghc-debug] Expect stack_marking starting from GHC 8.10

[Sven Tennie]

Sven Tennie pushed to branch wip/ghc-debug at Glasgow Haskell Compiler / GHC


Commits:
b9ff4bad by Sven Tennie at 2020-08-10T07:53:21+02:00
Expect stack_marking starting from GHC 8.10

This field was introduced with GHC 8.10.

- - - - -


2 changed files:

- libraries/ghc-heap/GHC/Exts/Heap/Closures.hs
- libraries/ghc-heap/GHC/Exts/Heap/FFIClosures.hsc


Changes:

=====================================
libraries/ghc-heap/GHC/Exts/Heap/Closures.hs
=====================================
@@ -302,7 +302,7 @@ data GenClosure b
      { info :: !StgInfoTable
      , stack_size :: !Word32 -- ^ stack size in *words*
      , stack_dirty :: !Word8 -- ^ non-zero => dirty
-#if __GLASGOW_HASKELL__ >= 811
+#if __GLASGOW_HASKELL__ >= 810
      , stack_marking :: Word8
 #endif
      , stackPointer :: !b -- ^ current stack pointer


=====================================
libraries/ghc-heap/GHC/Exts/Heap/FFIClosures.hsc
=====================================
@@ -53,7 +53,7 @@ peekTSOFields peekProfInfo ptr = do
 data StackFields = StackFields {
     stack_size :: Word32,
     stack_dirty :: Word8,
-#if __GLASGOW_HASKELL__ >= 811
+#if __GLASGOW_HASKELL__ >= 810
     stack_marking :: Word8,
 #endif
     stack :: [Word]
@@ -64,7 +64,7 @@ peekStackFields :: Ptr a -> IO StackFields
 peekStackFields ptr = do
     stack_size' <- (#peek struct StgStack_, stack_size) ptr ::IO Word32
     dirty' <- (#peek struct StgStack_, dirty) ptr
-#if __GLASGOW_HASKELL__ >= 811
+#if __GLASGOW_HASKELL__ >= 810
     marking' <- (#peek struct StgStack_, marking) ptr
 #endif
 
@@ -74,7 +74,7 @@ peekStackFields ptr = do
     return StackFields {
         stack_size = stack_size',
         stack_dirty = dirty',
-#if __GLASGOW_HASKELL__ >= 811
+#if __GLASGOW_HASKELL__ >= 810
         stack_marking = marking',
 #endif
         stack = stack'



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b9ff4bad26ccd32a2e4e6827e734c0fb3a63de0a

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b9ff4bad26ccd32a2e4e6827e734c0fb3a63de0a
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200812/ad8f4a7c/attachment-0001.html>