This looks good, then! But I'm seeing the same issue with the raw diff not having line numbers. Maybe it's a Phabricator bug, but can you upload a higher-context diff again, like last time? And then we'll be happy to review the next bit fixing CXXDestructorCall. http://llvm-reviews.chandlerc.com/D1594