Change got accepted, contained in snapshot 20190701. I would refrain from backporting to older versions of llvm for now, please reopen if you need that.