Compilation fix for trunk llvm