[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 13 commits: Hadrian: fix dyn_o/dyn_hi rule (#17534)

Marge Bot gitlab at gitlab.haskell.org
Fri Apr 17 17:18:04 UTC 2020



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


Commits:
85fc32f0 by Sylvain Henry at 2020-04-17T12:45:25-04:00
Hadrian: fix dyn_o/dyn_hi rule (#17534)

- - - - -
bfde3b76 by Ryan Scott at 2020-04-17T12:46:02-04:00
Fix #18065 by fixing an InstCo oversight in Core Lint

There was a small thinko in Core Lint's treatment of `InstCo`
coercions that ultimately led to #18065. The fix: add an apostrophe.
That's it!

Fixes #18065.

Co-authored-by: Simon Peyton Jones <simonpj at microsoft.com>

- - - - -
5d8963e9 by Sylvain Henry at 2020-04-17T13:17:43-04:00
GHC.Core.Opt renaming

* GHC.Core.Op                  => GHC.Core.Opt
* GHC.Core.Opt.Simplify.Driver => GHC.Core.Opt.Driver
* GHC.Core.Opt.Tidy            => GHC.Core.Tidy
* GHC.Core.Opt.WorkWrap.Lib    => GHC.Core.Opt.WorkWrap.Utils

As discussed in:
 * https://mail.haskell.org/pipermail/ghc-devs/2020-April/018758.html
 * https://gitlab.haskell.org/ghc/ghc/issues/13009#note_264650

- - - - -
6728f1de by Sylvain Henry at 2020-04-17T13:17:43-04:00
Modules: SysTools (#13009)

- - - - -
04a565ee by Sylvain Henry at 2020-04-17T13:17:43-04:00
Modules: Parser (#13009)

- - - - -
d71b7dd9 by Sylvain Henry at 2020-04-17T13:17:43-04:00
Modules: GHC.Builtin (#13009)

- - - - -
12db883f by Sylvain Henry at 2020-04-17T13:17:43-04:00
Modules: GHC.Iface.Recomp (#13009)

- - - - -
953f3ddc by Sylvain Henry at 2020-04-17T13:17:43-04:00
Modules: Settings (#13009)

Update Haddock submodule

Metric Decrease:
    Naperian
    parsing001

- - - - -
7bac731b by Ben Gamari at 2020-04-17T13:17:44-04:00
gitlab-ci: Bump FreeBSD bootstrap compiler to 8.10.1

- - - - -
49cb3f88 by Ben Gamari at 2020-04-17T13:17:44-04:00
gitlab-ci: Enable FreeBSD job for so-labelled MRs

- - - - -
d8eb6e86 by Ben Gamari at 2020-04-17T13:17:44-04:00
gitlab-ci: Use rules syntax for conditional jobs

- - - - -
2effbff2 by Ben Gamari at 2020-04-17T13:17:44-04:00
Bump hsc2hs submodule

- - - - -
bcb221d9 by Ömer Sinan Ağacan at 2020-04-17T13:17:57-04:00
Improve prepForeignCall error reporting

Show parameters and description of the error code when ffi_prep_cif
fails.

This may be helpful for debugging #17018.

- - - - -


30 changed files:

- .gitlab-ci.yml
- .gitlab/ci.sh
- compiler/GHC.hs
- compiler/prelude/PrelNames.hs → compiler/GHC/Builtin/Names.hs
- compiler/prelude/PrelNames.hs-boot → compiler/GHC/Builtin/Names.hs-boot
- compiler/prelude/THNames.hs → compiler/GHC/Builtin/Names/TH.hs
- compiler/prelude/PrimOp.hs → compiler/GHC/Builtin/PrimOps.hs
- compiler/prelude/PrimOp.hs-boot → compiler/GHC/Builtin/PrimOps.hs-boot
- compiler/prelude/TysWiredIn.hs → compiler/GHC/Builtin/Types.hs
- compiler/prelude/TysWiredIn.hs-boot → compiler/GHC/Builtin/Types.hs-boot
- compiler/typecheck/TcTypeNats.hs → compiler/GHC/Builtin/Types/Literals.hs
- compiler/prelude/TysPrim.hs → compiler/GHC/Builtin/Types/Prim.hs
- compiler/prelude/KnownUniques.hs → compiler/GHC/Builtin/Uniques.hs
- compiler/prelude/KnownUniques.hs-boot → compiler/GHC/Builtin/Uniques.hs-boot
- compiler/prelude/PrelInfo.hs → compiler/GHC/Builtin/Utils.hs
- compiler/prelude/primops.txt.pp → compiler/GHC/Builtin/primops.txt.pp
- compiler/GHC/ByteCode/Instr.hs
- compiler/GHC/ByteCode/Linker.hs
- compiler/GHC/ByteCode/Types.hs
- compiler/GHC/Cmm/CLabel.hs
- compiler/GHC/Cmm/Lexer.x
- compiler/GHC/Cmm/Monad.hs
- compiler/GHC/Cmm/Parser.y
- compiler/GHC/CmmToLlvm.hs
- compiler/GHC/Core.hs
- compiler/GHC/Core/Class.hs
- compiler/GHC/Core/Coercion.hs
- compiler/GHC/Core/Coercion/Axiom.hs
- compiler/GHC/Core/DataCon.hs
- compiler/GHC/Core/FVs.hs


The diff was not included because it is too large.


View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/eefc926c0871224d2679e8eb6534c5335a3409d6...bcb221d97a57d5b637e8e1ab9ea56b27c5800667

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/eefc926c0871224d2679e8eb6534c5335a3409d6...bcb221d97a57d5b637e8e1ab9ea56b27c5800667
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/20200417/56a36b64/attachment.html>


More information about the ghc-commits mailing list