aizatsky added a comment. Marshall, I'm happy to rebase it myself if you have some time for reviewing this afterwards. I'd like to verify that everything works since it has been quite a while since I last touched this. https://reviews.llvm.org/D12577