Fix for updates to trunk llvm