Fix for trunk llvm.