[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 2 commits: EPA: Fix FamDecl range

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC


Commits:
cd0fb82f by Alan Zimmerman at 2024-03-27T19:33:08+00:00
EPA: Fix FamDecl range

The span was incorrect if opt_datafam_kind_sig was empty

- - - - -
9f13dff2 by Ben Gamari at 2024-03-28T21:02:21-04:00
Fix type of _get_osfhandle foreign import

Fixes #24601.

- - - - -


2 changed files:

- compiler/GHC/Parser.y
- compiler/GHC/Runtime/Utils.hs


Changes:

=====================================
compiler/GHC/Parser.y
=====================================
@@ -1313,7 +1313,7 @@ ty_decl :: { LTyClDecl GhcPs }
 
           -- data/newtype family
         | 'data' 'family' type opt_datafam_kind_sig
-                {% mkFamDecl (comb3 $1 $2 $4) DataFamily TopLevel $3
+                {% mkFamDecl (comb4 $1 $2 $3 $4) DataFamily TopLevel $3
                                    (snd $ unLoc $4) Nothing
                           (mj AnnData $1:mj AnnFamily $2:(fst $ unLoc $4)) }
 


=====================================
compiler/GHC/Runtime/Utils.hs
=====================================
@@ -29,7 +29,7 @@ foreign import ccall "io.h _close"
    c__close :: CInt -> IO CInt
 
 foreign import ccall unsafe "io.h _get_osfhandle"
-   _get_osfhandle :: CInt -> IO CInt
+   _get_osfhandle :: CInt -> IO CIntPtr
 
 runWithPipesPOSIX :: (CreateProcess -> IO ProcessHandle)
                   -> FilePath -> [String] -> [String] -> IO (ProcessHandle, Handle, Handle)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2f522372a4d5ef887cf93d2843b8365683b2e60b...9f13dff2370b50cef57590c6875c546d3217a3d9

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2f522372a4d5ef887cf93d2843b8365683b2e60b...9f13dff2370b50cef57590c6875c546d3217a3d9
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/20240328/78de5559/attachment-0001.html>