diff options
author | Chris Lattner <sabre@nondot.org> | 2013-01-05 16:44:07 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2013-01-05 16:44:07 +0000 |
commit | 261304248f4f2cd0d9f0f85f91d400bcedeb0f45 (patch) | |
tree | be6b45477f82e5690c5a232673520fef39785f7d /lib/Transforms/Scalar/LICM.cpp | |
parent | e4b4edd72ae596ac8d1fdbc6e77f61e331f6775d (diff) | |
download | llvm-261304248f4f2cd0d9f0f85f91d400bcedeb0f45.tar.gz llvm-261304248f4f2cd0d9f0f85f91d400bcedeb0f45.tar.bz2 llvm-261304248f4f2cd0d9f0f85f91d400bcedeb0f45.tar.xz |
switch from pointer equality comparison to MDNode::getMostGenericTBAA
when merging two TBAA tags, pointed out by Nuno.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@171627 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/Scalar/LICM.cpp')
-rw-r--r-- | lib/Transforms/Scalar/LICM.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/Transforms/Scalar/LICM.cpp b/lib/Transforms/Scalar/LICM.cpp index 9335363ab2..dc6bef71d1 100644 --- a/lib/Transforms/Scalar/LICM.cpp +++ b/lib/Transforms/Scalar/LICM.cpp @@ -46,6 +46,7 @@ #include "llvm/IR/Instructions.h" #include "llvm/IR/IntrinsicInst.h" #include "llvm/IR/LLVMContext.h" +#include "llvm/IR/Metadata.h" #include "llvm/Support/CFG.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" @@ -816,10 +817,11 @@ void LICM::PromoteAliasSet(AliasSet &AS, if (LoopUses.empty()) { // On the first load/store, just take its TBAA tag. TBAATag = Use->getMetadata(LLVMContext::MD_tbaa); - } else if (TBAATag && TBAATag != Use->getMetadata(LLVMContext::MD_tbaa)) { - TBAATag = 0; + } else if (TBAATag) { + TBAATag = MDNode::getMostGenericTBAA(TBAATag, + Use->getMetadata(LLVMContext::MD_tbaa)); } - + LoopUses.push_back(Use); } } |