[Git][ghc/ghc][wip/T19075] 3 commits: Revert haddock submodule yet again

[Ben Gamari]

Ben Gamari pushed to branch wip/T19075 at Glasgow Haskell Compiler / GHC


Commits:
e9b18a75 by Ben Gamari at 2020-12-15T15:55:38-05:00
Revert haddock submodule yet again

- - - - -
b58cb63a by GHC GitLab CI at 2020-12-16T03:46:31+00:00
Bump haddock submodule

To adapt haddock for the nullary tyconapp optimisation patch.

- - - - -
e97d81c5 by Ben Gamari at 2020-12-16T12:30:20-05:00
rts/Messages: Relax locked-closure assertion

In general we are less careful about locking closures when running with
only a single capability.

Fixes #19075.

- - - - -


2 changed files:

- rts/Messages.h
- utils/haddock


Changes:

=====================================
rts/Messages.h
=====================================
@@ -25,8 +25,9 @@ void sendMessage    (Capability *from_cap, Capability *to_cap, Message *msg);
 INLINE_HEADER void
 doneWithMsgThrowTo (Capability *cap, MessageThrowTo *m)
 {
-    // The message better be locked
-    ASSERT(m->header.info == &stg_WHITEHOLE_info);
+    // The message better be locked (unless we are running single-threaded,
+    // where we are a bit more lenient (#19075).
+    ASSERT(n_capabilities == 1 || m->header.info == &stg_WHITEHOLE_info);
     IF_NONMOVING_WRITE_BARRIER_ENABLED {
       updateRemembSetPushClosure(cap, (StgClosure *) m->link);
       updateRemembSetPushClosure(cap, (StgClosure *) m->source);


=====================================
utils/haddock
=====================================
@@ -1 +1 @@
-Subproject commit 46c3db2460cea396fae525f4b9d8f40c34c0680e
+Subproject commit 059acb11d6134ee0d896bcf73c870958557a3909



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c7bfd425000955b130f76011492340f0dbc9c565...e97d81c5c3ce18c820fd2394650fdad625944d66

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c7bfd425000955b130f76011492340f0dbc9c565...e97d81c5c3ce18c820fd2394650fdad625944d66
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/20201216/ab6616a6/attachment.html>