lhames accepted this revision. lhames added a comment. This revision is now accepted and ready to land. Thanks for the ping, and sorry for the delayed review Rui. This looks good to me. http://reviews.llvm.org/D17791