Hi Alex, I've done some further modifications to correctly handle statements with a variable declaration in it (like `while (auto x = f()) ;`) and handling macro-expanded statements (ignoring them). If you think that it's ok now, can you please land this patch (I don't have write access). http://reviews.llvm.org/D5395