Fix for trunk llvm.
Merge branch 'master' into better-aliasing-info