aaron.ballman added a comment. Good catches! I've fixed those issues, and commit in r257097 (I thought I had the LG, but now notice I don't -- if this is a problem, I will revert). http://reviews.llvm.org/D15958