Rollup merge of #126774 - nnethercote:fix-126751, r=oli-obk

Fix another assertion failure for some Expect diagnostics.

Very similar to #126719. So much so that I added a new case to the test from that PR rather than creating a new one.

r? `@oli-obk`

Author: matthiaskrgr