[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 14 commits: testsuite: Skip dynamicToo006 when dynamic linking is not available

Sat Jun 22 14:06:11 UTC 2019

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


Commits:
2485c08a by Ben Gamari at 2019-06-21T17:32:34Z
testsuite: Skip dynamicToo006 when dynamic linking is not available

This was previously failling on Windows.

- - - - -
aa516431 by Ben Gamari at 2019-06-21T17:32:34Z
testsuite: Mark T3372 as fragile on Windows

On Windows we must lock package databases even when opening for
read-only access. This means that concurrent GHC sessions are very
likely to fail with file lock contention.

See #16773.

- - - - -
2eedb120 by Ben Gamari at 2019-06-21T17:32:34Z
testsuite: Add stderr output for UnsafeInfered02 on Windows

This test uses TemplateHaskell causing GHC to build dynamic objects on
platforms where dynamic linking is available. However, Windows doesn't support
dynamic linking. Consequently the test would fail on Windows with:

```patch

--- safeHaskell/safeInfered/UnsafeInfered02.run/UnsafeInfered02.stderr.normalised	2019-06-04 15:10:10.521594200 +0000
+++ safeHaskell/safeInfered/UnsafeInfered02.run/UnsafeInfered02.comp.stderr.normalised	2019-06-04 15:10:10.523546200 +0000
@@ -1,5 +1,5 @@
-[1 of 2] Compiling UnsafeInfered02_A ( UnsafeInfered02_A.hs, UnsafeInfered02_A.o, UnsafeInfered02_A.dyn_o )
-[2 of 2] Compiling UnsafeInfered02  ( UnsafeInfered02.hs, UnsafeInfered02.o, UnsafeInfered02.dyn_o )
+[1 of 2] Compiling UnsafeInfered02_A ( UnsafeInfered02_A.hs, UnsafeInfered02_A.o )
+[2 of 2] Compiling UnsafeInfered02  ( UnsafeInfered02.hs, UnsafeInfered02.o )

 UnsafeInfered02.hs:4:1:
     UnsafeInfered02_A: Can't be safely imported!
```

The other approach I considered for this issue is to pass `-v0` to GHC.
However, I felt we should probably do this consistently for all of the tests in
this directory and this would take more time than I currently have.

- - - - -
3967d13a by Ben Gamari at 2019-06-21T17:32:34Z
testsuite: Mark OldModLocation as broken on Windows

Strangely the path it emits contains duplicate path delimiters (#16772),
```patch
--- ghc-api/downsweep/OldModLocation.run/OldModLocation.stderr.normalised	2019-06-04 14:40:26.326075000 +0000
+++ ghc-api/downsweep/OldModLocation.run/OldModLocation.run.stderr.normalised	2019-06-04 14:40:26.328029200 +0000
@@ -1 +1 @@
-[Just "A.hs",Just "mydir/B.hs"]
+[Just "A.hs",Just "mydir//B.hs"]
```

- - - - -
31f2ea68 by Ben Gamari at 2019-06-21T17:32:34Z
testsuite: Mark T7170 as broken on Windows

Due to #16801.

- - - - -
7bd1c3e1 by Ben Gamari at 2019-06-21T17:32:34Z
testsuite: Mark T7702 as broken on Windows

Due to #16799.

- - - - -
84900724 by Ben Gamari at 2019-06-21T17:32:34Z
testsuite: Mark T15633a and T15633b as fragile on Windows

As noted in #16813, these tests seem to be fragile on Windows.

- - - - -
49fff41d by Ben Gamari at 2019-06-21T17:32:34Z
linker: Disable code unloading

As noted in #16841, there are currently a variety of bugs in the
unloading logic. These only affect Windows since code unloading is
disabled on Linux, where we build with `GhcDynamic=YES` by default.

In the interest of getting the tree green on Windows disable code
unloading until the issues are resolved.

- - - - -
e0595d22 by Ben Gamari at 2019-06-22T13:36:53Z
testsuite: Mark T16608_* as fragile on Darwin

As noted in #16855.

- - - - -
655c6e26 by Ben Gamari at 2019-06-22T14:06:05Z
ghci: Don't rely on resolution of System.IO to base module

Previously we would hackily evaluate a textual code snippet to compute
actions to disable I/O buffering and flush the stdout/stderr handles.
This broke in a number of ways (#15336, #16563).

Instead we now ship a module (`GHC.GHCi.Helpers`) with `base` containing
the needed actions. We can then easily refer to these via `Orig` names.

- - - - -
8f8fc31b by Ben Gamari at 2019-06-22T14:06:05Z
testsuite: Add test for #16563

- - - - -
22e721c1 by Ben Gamari at 2019-06-22T14:06:05Z
testsuite: Mark T5611 as broken in ghci way

As described in #16845.

- - - - -
b0d6bf2a by Ben Gamari at 2019-06-22T14:06:05Z
rts: Reset STATIC_LINK field of reverted CAFs

When we revert a CAF we must reset the STATIC_LINK field lest the GC
might ignore the CAF (e.g. as it carries the STATIC_FLAG_LIST flag) and
will consequently overlook references to object code that we are trying
to unload. This would result in the reachable object code being
unloaded. See Note [CAF lists] and Note [STATIC_LINK fields].

This fixes #16842.

Idea-due-to: Phuong Trinh <lolotp at fb.com>

- - - - -
1f2fff89 by Ben Gamari at 2019-06-22T14:06:05Z
testsuite: Add caf_crash testcase

- - - - -


30 changed files:

- compiler/ghci/Linker.hs
- compiler/prelude/PrelNames.hs
- ghc/GHCi/UI/Monad.hs
- + libraries/base/GHC/GHCi/Helpers.hs
- libraries/base/base.cabal
- libraries/ghc-boot/GHC/PackageDb.hs
- rts/sm/GCAux.c
- testsuite/tests/concurrent/should_run/all.T
- testsuite/tests/driver/T16608/all.T
- testsuite/tests/driver/dynamicToo/dynamicToo006/all.T
- testsuite/tests/ffi/should_run/all.T
- testsuite/tests/ghc-api/downsweep/all.T
- testsuite/tests/ghci.debugger/scripts/break006.stdout
- testsuite/tests/ghci.debugger/scripts/break013.stdout
- testsuite/tests/ghci.debugger/scripts/hist001.stdout
- testsuite/tests/ghci.debugger/scripts/hist002.stdout
- + testsuite/tests/ghci/caf_crash/A.hs
- + testsuite/tests/ghci/caf_crash/B.hs
- + testsuite/tests/ghci/caf_crash/D.hs
- + testsuite/tests/ghci/caf_crash/all.T
- + testsuite/tests/ghci/caf_crash/caf_crash.script
- + testsuite/tests/ghci/caf_crash/caf_crash.stdout
- testsuite/tests/ghci/linking/dyn/all.T
- + testsuite/tests/ghci/scripts/T16563.script
- + testsuite/tests/ghci/scripts/T16563.stdout
- testsuite/tests/ghci/scripts/T4175.stdout
- testsuite/tests/ghci/scripts/T7627.stdout
- testsuite/tests/ghci/scripts/T8469.stdout
- testsuite/tests/ghci/scripts/all.T
- testsuite/tests/ghci/scripts/ghci011.stdout


The diff was not included because it is too large.


View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/1305202020ab3a306dd66bb921731226fefcf722...1f2fff89afebb065b27eba0f6e1f89e25c1c158d

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/1305202020ab3a306dd66bb921731226fefcf722...1f2fff89afebb065b27eba0f6e1f89e25c1c158d
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/20190622/1b7fc844/attachment.html>
