Instead the attached patch uses metadata that is accessible when these assertion macros are expanded to provide accurate file and line numbers. To do this it bypasses do-report, calling report directly.
Many thanks to Thomas Heller for coming up with the patch.
I like it, would be nice to see the results of CI here w/ the patch applied. I wonder if there’s a good way to test this?