LLVM trunk API changes. Fixes #7796