ruiu accepted this revision. ruiu added a comment. This revision is now accepted and ready to land. LGTM It might be worth trying to search for a way to remove StringRefZ class cleanly, but this patch looks good as is. Thank you for doing this! https://reviews.llvm.org/D46080