I've tried to revert this commit on master and the trace worked fine, after reverting the revert, it crashed again. I've also tried (with and without this commit) to build with -O0 to rule out compiler optimization bugs. This is on Debian unstable with gcc (Debian 4.8.2-16) 4.8.2