beanz added a comment. Everything about this looks reasonable to me. Can you commit the test changes in a separate commit before committing the other changes? That way if something goes wrong the diff for the meat of the patch is a small diff. http://reviews.llvm.org/D15920