[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 3 commits: EPA: Remove unused hsCaseAnnsRest
Marge Bot (@marge-bot)
gitlab at gitlab.haskell.org
Sun Oct 6 22:15:56 UTC 2024
Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC
Commits:
08943213 by Alan Zimmerman at 2024-10-06T18:15:37-04:00
EPA: Remove unused hsCaseAnnsRest
We never populate it, so remove it.
- - - - -
f1c38322 by John Paul Adrian Glaubitz at 2024-10-06T18:15:43-04:00
rts: Fix invocation of __ieee_set_fp_control() on alpha-linux
Fixes the following error when building GHC on alpha-linux:
rts/posix/Signals.c: In function ‘initDefaultHandlers’:
rts/posix/Signals.c:709:5: error:
error: implicit declaration of function ‘ieee_set_fp_control’ [-Wimplicit-function-declaration]
709 | ieee_set_fp_control(0);
| ^~~~~~~~~~~~~~~~~~~
|
709 | ieee_set_fp_control(0);
|
- - - - -
a2f4b35e by Teo Camarasu at 2024-10-06T18:15:44-04:00
Add changelog entries for !12479
- - - - -
7 changed files:
- compiler/GHC/Hs/Expr.hs
- compiler/GHC/Parser.y
- libraries/base/changelog.md
- libraries/template-haskell/changelog.md
- rts/posix/Signals.c
- testsuite/tests/parser/should_compile/DumpSemis.stderr
- utils/check-exact/ExactPrint.hs
Changes:
=====================================
compiler/GHC/Hs/Expr.hs
=====================================
@@ -202,11 +202,10 @@ type instance XUntypedBracket GhcTc = HsBracketTc
data EpAnnHsCase = EpAnnHsCase
{ hsCaseAnnCase :: EpaLocation
, hsCaseAnnOf :: EpaLocation
- , hsCaseAnnsRest :: [AddEpAnn]
} deriving Data
instance NoAnn EpAnnHsCase where
- noAnn = EpAnnHsCase noAnn noAnn noAnn
+ noAnn = EpAnnHsCase noAnn noAnn
data EpAnnUnboundVar = EpAnnUnboundVar
{ hsUnboundBackquotes :: (EpaLocation, EpaLocation)
=====================================
compiler/GHC/Parser.y
=====================================
@@ -3042,7 +3042,7 @@ aexp :: { ECP }
return $ ECP $
$4 >>= \ $4 ->
mkHsCasePV (comb3 $1 $3 $4) $2 $4
- (EpAnnHsCase (glAA $1) (glAA $3) []) }
+ (EpAnnHsCase (glAA $1) (glAA $3)) }
-- QualifiedDo.
| DO stmtlist {% do
hintQualifiedDo $1
=====================================
libraries/base/changelog.md
=====================================
@@ -34,6 +34,7 @@
the context since it will be redundant. These functions are mostly useful
for libraries that define exception-handling combinators like `catch` and
`onException`, such as `base`, or the `exceptions` package.
+ * Move `Lift ByteArray` and `Lift Fixed` instances into `base` from `template-haskell`. See [CLC proposal #287](https://github.com/haskell/core-libraries-committee/issues/287).
## 4.20.0.0 May 2024
* Shipped with GHC 9.10.1
=====================================
libraries/template-haskell/changelog.md
=====================================
@@ -4,6 +4,7 @@
* Extend `Exp` with `ForallE`, `ForallVisE`, `ConstraintedE`,
introduce functions `forallE`, `forallVisE`, `constraintedE` (GHC Proposal #281).
+ * `template-haskell` is no longer wired-in. All wired-in identifiers have been moved to `ghc-internal`.
## 2.22.1.0
=====================================
rts/posix/Signals.c
=====================================
@@ -27,7 +27,7 @@
#if defined(alpha_HOST_ARCH)
# if defined(linux_HOST_OS)
-# include <asm/fpu.h>
+# include <fenv.h>
# else
# include <machine/fpu.h>
# endif
@@ -721,7 +721,11 @@ initDefaultHandlers(void)
#endif
#if defined(alpha_HOST_ARCH)
+# if defined(linux_HOST_OS)
+ __ieee_set_fp_control(0);
+# else
ieee_set_fp_control(0);
+# endif
#endif
// ignore SIGPIPE; see #1619
=====================================
testsuite/tests/parser/should_compile/DumpSemis.stderr
=====================================
@@ -2170,8 +2170,7 @@
(HsCase
(EpAnnHsCase
(EpaSpan { DumpSemis.hs:37:3-6 })
- (EpaSpan { DumpSemis.hs:37:10-11 })
- [])
+ (EpaSpan { DumpSemis.hs:37:10-11 }))
(L
(EpAnn
(EpaSpan { DumpSemis.hs:37:8 })
=====================================
utils/check-exact/ExactPrint.hs
=====================================
@@ -1211,7 +1211,6 @@ laiElseSemi k parent = fmap (\new -> parent { aiElseSemi = new })
-- data EpAnnHsCase = EpAnnHsCase
-- { hsCaseAnnCase :: EpaLocation
-- , hsCaseAnnOf :: EpaLocation
--- , hsCaseAnnsRest :: [AddEpAnn]
-- } deriving Data
lhsCaseAnnCase :: Lens EpAnnHsCase EpaLocation
@@ -1222,10 +1221,6 @@ lhsCaseAnnOf :: Lens EpAnnHsCase EpaLocation
lhsCaseAnnOf k parent = fmap (\new -> parent { hsCaseAnnOf = new })
(k (hsCaseAnnOf parent))
-lhsCaseAnnsRest :: Lens EpAnnHsCase [AddEpAnn]
-lhsCaseAnnsRest k parent = fmap (\new -> parent { hsCaseAnnsRest = new })
- (k (hsCaseAnnsRest parent))
-
-- ---------------------------------------------------------------------
-- data HsRuleAnn
@@ -3161,11 +3156,8 @@ instance ExactPrint (HsExpr GhcPs) where
an0 <- markLensKw an lhsCaseAnnCase AnnCase
e' <- markAnnotated e
an1 <- markLensKw an0 lhsCaseAnnOf AnnOf
- an2 <- markEpAnnL an1 lhsCaseAnnsRest AnnOpenC
- an3 <- markEpAnnAllL' an2 lhsCaseAnnsRest AnnSemi
alts' <- setLayoutBoth $ markAnnotated alts
- an4 <- markEpAnnL an3 lhsCaseAnnsRest AnnCloseC
- return (HsCase an4 e' alts')
+ return (HsCase an1 e' alts')
exact (HsIf an e1 e2 e3) = do
an0 <- markLensKw an laiIf AnnIf
@@ -3635,11 +3627,8 @@ instance ExactPrint (HsCmd GhcPs) where
an0 <- markLensKw an lhsCaseAnnCase AnnCase
e' <- markAnnotated e
an1 <- markLensKw an0 lhsCaseAnnOf AnnOf
- an2 <- markEpAnnL an1 lhsCaseAnnsRest AnnOpenC
- an3 <- markEpAnnAllL' an2 lhsCaseAnnsRest AnnSemi
alts' <- markAnnotated alts
- an4 <- markEpAnnL an3 lhsCaseAnnsRest AnnCloseC
- return (HsCmdCase an4 e' alts')
+ return (HsCmdCase an1 e' alts')
exact (HsCmdIf an a e1 e2 e3) = do
an0 <- markLensKw an laiIf AnnIf
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/50d9fc5e73228228c5ca79fb615df38544688108...a2f4b35e3120c11a13fe785cbd6b8901cfcc6a14
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/50d9fc5e73228228c5ca79fb615df38544688108...a2f4b35e3120c11a13fe785cbd6b8901cfcc6a14
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/20241006/c556a705/attachment-0001.html>
More information about the ghc-commits
mailing list