Catch up with latest llvm changes