[Git][ghc/ghc][master] RTS: -Ds - make sure incall is non-zero before dereferencing it.

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
0f40d68f by Andreas Klebinger at 2024-02-21T05:03:09-05:00
RTS: -Ds - make sure incall is non-zero before dereferencing it.

Fixes #24445

- - - - -


1 changed file:

- rts/Capability.c


Changes:

=====================================
rts/Capability.c
=====================================
@@ -495,7 +495,7 @@ giveCapabilityToTask (Capability *cap USED_IF_DEBUG, Task *task)
     ASSERT_LOCK_HELD(&cap->lock);
     ASSERT(task->cap == cap);
     debugTrace(DEBUG_sched, "passing capability %d to %s %#" FMT_HexWord64,
-               cap->no, task->incall->tso ? "bound task" : "worker",
+               cap->no, task->incall && task->incall->tso ? "bound task" : "worker",
                serialisableTaskId(task));
     ACQUIRE_LOCK(&task->lock);
     if (task->wakeup == false) {



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0f40d68f2febf6efffd8365e00dd2ccc10c55b90

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0f40d68f2febf6efffd8365e00dd2ccc10c55b90
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/20240221/859082b9/attachment.html>