This seems to work
Disable scope restores temporarily to see the original crash
Testcases from PR gdb/14963 comments 16 and 18
Testcases from PR gdb/16752 comment 1
Reinstate the test case
Restore to current upstream (ish) -> three segfaults
Restore today's fix