Hi, this is an updated version of my patch that was originally only intended to fix the issues with inline functions in the same file. That needed re-basing anyway, because of a merge conflict. I removed the code that does the special handling of end sequence markers in record_line now, since it seems to cause more problems than it solves. I believe it will fix the regression that Louis pointed out, and should fix the regression that Andrew wanted to fix with his patch: [PATCH 2/2] gdb: Preserve is-stmt lines when switch between files https://marc.info/?l=gdb-patches&m=158595247916817&w=2 So I hope that will not be necessary after this. There is a theoretic issue with line numbers at the end of a function, these could coincidentally have the same PC as the following function. That might need more work to solve that, in the moment I have not yet looked at tracking that down. Thanks Bernd.