rSerge added a comment. As I understood, __xray_remove_handler() is not yet implemented (just declared). Shouldn't it go to this fix too? I think it's about a line of somewhat related code. https://reviews.llvm.org/D23154