LGTM with changes suggested by Greg and Ed. By the way, to make future reviews easier you can add some more context in the patch, see: http://llvm.org/docs/Phabricator.html#requesting-a-review-via-the-web-interface http://llvm-reviews.chandlerc.com/D1976