diff options
| author | dim <dim@FreeBSD.org> | 2015-02-14 14:13:00 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-02-14 14:13:00 +0000 |
| commit | 9377b5ad0feb5dd018ed6cfc6378ac19c1252dfe (patch) | |
| tree | a7bc5b362ad6182396e88b223352f75d52966813 /contrib/llvm/lib/Transforms/Utils/Local.cpp | |
| parent | ff34755926ad8a77e4498e82a23c847d33c6c72d (diff) | |
| download | FreeBSD-src-9377b5ad0feb5dd018ed6cfc6378ac19c1252dfe.zip FreeBSD-src-9377b5ad0feb5dd018ed6cfc6378ac19c1252dfe.tar.gz | |
Merge llvm 3.6.0rc3 from ^/vendor/llvm/dist, merge clang 3.6.0rc3 from
^/vendor/clang/dist, resolve conflicts, and update patches README.
Diffstat (limited to 'contrib/llvm/lib/Transforms/Utils/Local.cpp')
| -rw-r--r-- | contrib/llvm/lib/Transforms/Utils/Local.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/llvm/lib/Transforms/Utils/Local.cpp b/contrib/llvm/lib/Transforms/Utils/Local.cpp index 08a4b3f..2a84d7e 100644 --- a/contrib/llvm/lib/Transforms/Utils/Local.cpp +++ b/contrib/llvm/lib/Transforms/Utils/Local.cpp @@ -1328,6 +1328,8 @@ void llvm::combineMetadata(Instruction *K, const Instruction *J, ArrayRef<unsign K->setMetadata(Kind, MDNode::getMostGenericTBAA(JMD, KMD)); break; case LLVMContext::MD_alias_scope: + K->setMetadata(Kind, MDNode::getMostGenericAliasScope(JMD, KMD)); + break; case LLVMContext::MD_noalias: K->setMetadata(Kind, MDNode::intersect(JMD, KMD)); break; |
