llvm fix
Merge branch 'refs/heads/master' into llvm
fix tuple for llvm