Supporting LLVM trunk after r202052 revision