diff options
| author | dim <dim@FreeBSD.org> | 2015-02-14 12:17:42 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-02-14 12:17:42 +0000 |
| commit | 85d2764eab2b31219ea47d67716640c1c613a0fa (patch) | |
| tree | d332f023fbc1365c9129fe463cb61d4147ac16ec /lib/Transforms/Utils/Local.cpp | |
| parent | 61b6748e4ff97683c06ed1004b092ebb807b0529 (diff) | |
| download | FreeBSD-src-85d2764eab2b31219ea47d67716640c1c613a0fa.zip FreeBSD-src-85d2764eab2b31219ea47d67716640c1c613a0fa.tar.gz | |
Vendor import of llvm RELEASE_360/rc3 tag r229040 (effectively, 3.6.0 RC3):
https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_360/rc3@229040
Diffstat (limited to 'lib/Transforms/Utils/Local.cpp')
| -rw-r--r-- | lib/Transforms/Utils/Local.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/Transforms/Utils/Local.cpp b/lib/Transforms/Utils/Local.cpp index 08a4b3f..2a84d7e 100644 --- a/lib/Transforms/Utils/Local.cpp +++ b/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; |
