[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 48 commits: gitlab-ci: Linters, don't allow to fail

Marge Bot gitlab at gitlab.haskell.org
Sat Jun 8 17:40:44 UTC 2019 


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


Commits:
07dc79c3 by Matthew Pickering at 2019-06-08T17:34:18Z
gitlab-ci: Linters, don't allow to fail

Ben disabled them in cd85f8a71bb56cff332560e1d571b3406789fb71 but didn't
say how or why they were broken.

- - - - -
fd840b64 by Matthew Pickering at 2019-06-08T17:34:18Z
gitlab-ci: Don't run two submodule checking jobs on Marge jobs

- - - - -
310d0c4c by Matthew Pickering at 2019-06-08T17:34:18Z
Fix two lint failures in rts/linker/MachO.c

- - - - -
fe965316 by Ben Gamari at 2019-06-08T17:34:18Z
gitlab-ci: Use --unshallow when fetching for linters

GitLab creates a shallow clone. However, this means that we may not have
the base commit of an MR when linting, causing `git merge-base` to fail.
Fix this by passing `--unshallow` to `git fetch`, ensuring that we have
the entire history.

- - - - -
f58234ea by Ben Gamari at 2019-06-08T17:34:18Z
gitlab-ci: Fix submodule linter

The job script didn't even try to compute the base commit to lint with
respect to.

- - - - -
c392f987 by Ben Gamari at 2019-06-08T17:34:18Z
gitlab-ci: A few clarifying comments

- - - - -
709290b0 by Matthew Pickering at 2019-06-08T17:38:15Z
Remove trailing whitespace

[skip ci]

This should really be caught by the linters! (#16711)

- - - - -
af730a86 by Alexandre Baldé at 2019-06-08T17:39:56Z
Explain that 'mappend' and '(<>)' should be the same [skip ci]

- - - - -
c3f063ff by chessai at 2019-06-08T17:39:58Z
make log1p and expm1 primops

- - - - -
b19594f3 by chessai at 2019-06-08T17:39:58Z
add tests for new log1p/expm1

- - - - -
8d33ffe7 by Ben Gamari at 2019-06-08T17:39:59Z
testsuite: Add test for #16514

- - - - -
9b0889b4 by Ben Gamari at 2019-06-08T17:39:59Z
gitlab-ci: Test using slowtest in deb9-debug job

- - - - -
b7b89858 by Ben Gamari at 2019-06-08T17:39:59Z
testsuite: Mark hWaitForInput-accurate-stdin as broken in threaded ways

As noted in #16535.

- - - - -
e482f0d2 by Ben Gamari at 2019-06-08T17:39:59Z
testsuite: Make closureSize less sensitive to optimisation

- - - - -
897ae8ed by Ben Gamari at 2019-06-08T17:39:59Z
process: Bump submodule

 * Skip process005 in ghci way
 * Mark process002 as fragile in threaded2

- - - - -
790c0405 by Ben Gamari at 2019-06-08T17:40:00Z
testsuite: Mark T13167 as fragile in threaded2

As noted in #16536.

- - - - -
ee482417 by Ben Gamari at 2019-06-08T17:40:00Z
testsuite: Mark T13910 as broken in optasm

Due to #16537.

- - - - -
e0ec212a by Ben Gamari at 2019-06-08T17:40:00Z
testsuite: Mark T14761c as broken in hpc and optasm ways

As noted in #16540.

- - - - -
030ac995 by Ben Gamari at 2019-06-08T17:40:00Z
testsuite: Mark T16180 as broken in ghci and ext-interp ways

As noted in #16541.

- - - - -
6e13c30b by Ben Gamari at 2019-06-08T17:40:00Z
testsuite: Omit tcrun022 in hpc way

As noted in #16542, the expected rule doesn't fire. However, this
doesn't seem terribly surpring given the circumstances.

- - - - -
9dedea1c by Ben Gamari at 2019-06-08T17:40:00Z
testsuite: Mark Overflow as broken in hpc way

As noted in #16543.

- - - - -
62c0a3d2 by Ben Gamari at 2019-06-08T17:40:00Z
testsuite: Mark closure_size as broken in threaded2, optasm, dyn ways

As noted in #16531.

- - - - -
36a3db54 by Ben Gamari at 2019-06-08T17:40:00Z
testsuite: Mark T2783 as fragile in threaded1

It was previously marked as broken but it passes non-deterministically.
See #2783.

- - - - -
675977bd by Ben Gamari at 2019-06-08T17:40:00Z
testsuite: Skip T7919 in ghci way

It times out pretty reliably. It's not clear that much is gained by
running this test in the ghci way anyways.

- - - - -
7973c26e by Ben Gamari at 2019-06-08T17:40:00Z
testsuite: Fix fragile_for test modifier

- - - - -
38e17c3b by Ben Gamari at 2019-06-08T17:40:00Z
Bump unix submodule

Marks posix002 as fragile in threaded2 way due to #16550.

- - - - -
c653a0ab by Ben Gamari at 2019-06-08T17:40:00Z
testsuite: Fix omit_ways usage

omit_ways expects a list but this was broken in several cases.

- - - - -
9e739df6 by Ben Gamari at 2019-06-08T17:40:00Z
testsuite: Mark threadstatus-T9333 as fragile in ghci way

As noted in #16555.

- - - - -
114c47cc by Ben Gamari at 2019-06-08T17:40:00Z
testsuite: Omit profasm way for cc017

cc017 requires TH but we can't load dynamic profiled objects.

- - - - -
54973271 by Ben Gamari at 2019-06-08T17:40:00Z
testsuite: Skip T493 in ghci way.

T493 tests #493, which is an FFI test. FFI tests should be skipped
in ghci way.

- - - - -
c81f7563 by Ben Gamari at 2019-06-08T17:40:00Z
testsuite: Mark T16449_2 as broken due to #16742

- - - - -
4ee43517 by Simon Jakobi at 2019-06-08T17:40:03Z
Small refactorings in ExtractDocs

- - - - -
90edc52e by Oleg Grenrus at 2019-06-08T17:40:06Z
Add -Winferred-safe-imports warning

This commit partly reverts e69619e923e84ae61a6bb4357f06862264daa94b
commit by reintroducing Sf_SafeInferred SafeHaskellMode.

We preserve whether module was declared or inferred Safe.  When
declared-Safe module imports inferred-Safe, we warn.  This inferred
status is volatile, often enough it's a happy coincidence, something
which cannot be relied upon. However, explicitly Safe or Trustworthy
packages won't accidentally become Unsafe.

- - - - -
59b788b1 by Oleg Grenrus at 2019-06-08T17:40:06Z
Add -Wmissing-safe-haskell-mode warning

- - - - -
266bfbf8 by Alp Mestanogullari at 2019-06-08T17:40:08Z
Refine the GHCI macro into HAVE[_{INTERNAL, EXTERNAL}]_INTERPRETER

As discussed in #16331, the GHCI macro, defined through 'ghci' flags
in ghc.cabal.in, ghc-bin.cabal.in and ghci.cabal.in, is supposed to indicate
whether GHC is built with support for an internal interpreter, that runs in
the same process. It is however overloaded in a few places to mean
"there is an interpreter available", regardless of whether it's an internal
or external interpreter.

For the sake of clarity and with the hope of more easily being able to
build stage 1 GHCs with external interpreter support, this patch splits
the previous GHCI macro into 3 different ones:

- HAVE_INTERNAL_INTERPRETER: GHC is built with an internal interpreter
- HAVE_EXTERNAL_INTERPRETER: GHC is built with support for external interpreters
- HAVE_INTERPRETER: HAVE_INTERNAL_INTERPRETER || HAVE_EXTERNAL_INTERPRETER

- - - - -
0d099a42 by Kevin Buhr at 2019-06-08T17:40:09Z
Handle trailing path separator in package DB names (#16360)

Package DB directories with trailing separator (provided via
GHC_PACKAGE_PATH or via -package-db) resulted in incorrect calculation of
${pkgroot} substitution variable.  Keep the trailing separator while
resolving as directory or file, but remove it before dropping the last
path component with takeDirectory.

Closes #16360.

- - - - -
223371e9 by Richard Eisenberg at 2019-06-08T17:40:12Z
Fix #16517 by bumping the TcLevel for method sigs

There were actually two bugs fixed here:

1. candidateQTyVarsOfType needs to be careful that it does not
   try to zap metavariables from an outer scope as "naughty"
   quantification candidates. This commit adds a simple check
   to avoid doing so.

2. We weren't bumping the TcLevel in kcHsKindSig, which was used
   only for class method sigs. This mistake led to the acceptance
   of

     class C a where
       meth :: forall k. Proxy (a :: k) -> ()

   Note that k is *locally* quantified. This patch fixes the
   problem by using tcClassSigType, which correctly bumps the
   level. It's a bit inefficient because tcClassSigType does other
   work, too, but it would be tedious to repeat much of the code
   there with only a few changes. This version works well and is
   simple.

And, while updating comments, etc., I noticed that tcRnType was
missing a pushTcLevel, leading to #16767, which this patch also
fixes, by bumping the level. In the refactoring here, I also
use solveEqualities. This initially failed ghci/scripts/T15415,
but that was fixed by teaching solveEqualities to respect
-XPartialTypeSignatures.

This patch also cleans up some Notes around error generation that
came up in conversation.

Test case: typecheck/should_fail/T16517, ghci/scripts/T16767

- - - - -
8cbb00d0 by Roland Senn at 2019-06-08T17:40:14Z
Add disable/enable commands to ghci debugger #2215

This patch adds two new commands `:enable` and `:disable` to the GHCi debugger.
Opposite to `:set stop <n> :continue` a breakpoint disabled with `:disable` will
not loose its previously set stop command.
A new field breakEnabled is added to the BreakLocation data structure to
track the enable/disable state. When a breakpoint is disabled with a `:disable`
command, the following happens:

The corresponding BreakLocation data element is searched dictionary of the
`breaks` field of the GHCiStateMonad. If the break point is found and not
already in the disabled state, the breakpoint is removed from bytecode.
The BreakLocation data structure is kept in the breaks list and the new
breakEnabled field is set to false.

The `:enable` command works similar.

The breaks field in the GHCiStateMonad was changed from an association list
to int `IntMap`.

- - - - -
61115979 by nineonine at 2019-06-08T17:40:16Z
Do not report error if Name in pragma is unbound

- - - - -
aeed1b21 by David Eichmann at 2019-06-08T17:40:20Z
Hadrian: need CPP preprocessor dependencies #16660

Use the new -include-cpp-deps ghc option (#16521)
when generating .dependencies files in hadrian.
This is version gated as -include-cpp-deps is a
relatively new option.

- - - - -
a1b49e37 by Alp Mestanogullari at 2019-06-08T17:40:22Z
rts/RtsFlags.c: mention that -prof too enables support for +RTS -l

- - - - -
96377caf by Matthew Pickering at 2019-06-08T17:40:23Z
hadrian: Properly partition options in sourceArgs

Previously if you build the `ghc` package then it would has the default
opts and the library opts. This is different behaviour to make where the
library opts are only reserved for things in the `libraries`
subdirectory (I believe)

Fixes #16716

- - - - -
60d29a8f by Richard Eisenberg at 2019-06-08T17:40:25Z
Comments only: document tcdDataCusk better.

- - - - -
cdc2cd6e by Richard Eisenberg at 2019-06-08T17:40:26Z
Comments only: document newtypes' DataConWrapId

- - - - -
be58e69b by Vladislav Zavialov at 2019-06-08T17:40:27Z
Print role annotations in TemplateHaskell brackets (#16718)

- - - - -
15f250fd by Ben Gamari at 2019-06-08T17:40:28Z
Maintain separate flags for C++ compiler invocations

Previously we would pass flags intended for the C compiler to the C++
compiler (see #16738). This would cause, for instance, `-std=gnu99` to
be passed to the C++ compiler, causing spurious test failures. Fix this
by maintaining a separate set of flags for C++ compilation invocations.

- - - - -
9acbae65 by John Ericson at 2019-06-08T17:40:30Z
Remove CPP ensuring word size is 32 or 64 bits around Addr# <-> int# primops

It shouldn't be needed these days, and those primops are "highly
deprecated" anyways.

This fits with my plans because it removes one bit of target-dependence
of the builtin primops, and this is the hardest part of GHC to make
multi-target.

CC @carter

- - - - -
bb8bb1cf by Daniel Gröber at 2019-06-08T17:40:31Z
rts: Fix RetainerProfile early return with TREC_CHUNK

When pop() returns with `*c == NULL` retainerProfile will immediately
return. All other code paths is pop() continue with the next stackElement
when this happens so it seems weird to me that TREC_CHUNK we would suddenly
abort everything even though the stack might still have elements left to
process.

- - - - -


30 changed files:

- .gitlab-ci.yml
- aclocal.m4
- compiler/basicTypes/MkId.hs
- compiler/cmm/CmmMachOp.hs
- compiler/cmm/MkGraph.hs
- compiler/cmm/PprC.hs
- compiler/codeGen/StgCmmForeign.hs
- compiler/codeGen/StgCmmPrim.hs
- compiler/deSugar/ExtractDocs.hs
- compiler/ghc.cabal.in
- compiler/ghci/GHCi.hs
- compiler/ghci/Linker.hs
- compiler/ghci/LinkerTypes.hs
- compiler/hsSyn/HsDecls.hs
- compiler/llvmGen/LlvmCodeGen/CodeGen.hs
- compiler/main/DynFlags.hs
- compiler/main/DynamicLoading.hs
- compiler/main/HscMain.hs
- compiler/main/HscTypes.hs
- compiler/main/Packages.hs
- compiler/main/Settings.hs
- compiler/main/SysTools.hs
- compiler/main/SysTools/Info.hs
- compiler/main/SysTools/Tasks.hs
- compiler/main/ToolSettings.hs
- compiler/nativeGen/PPC/CodeGen.hs
- compiler/nativeGen/SPARC/CodeGen.hs
- compiler/nativeGen/X86/CodeGen.hs
- compiler/prelude/primops.txt.pp
- compiler/rename/RnEnv.hs


The diff was not included because it is too large.


View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/96701da56ec4f5f5f3defc6f409b2c16ad6eef83...bb8bb1cf61a1eb10b7bfda3e9a8f37929c8d3df6

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/96701da56ec4f5f5f3defc6f409b2c16ad6eef83...bb8bb1cf61a1eb10b7bfda3e9a8f37929c8d3df6
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/20190608/4cccd42c/attachment-0001.html>

More information about the ghc-commits mailing list