replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

switch from pointer equality comparison to MDNode::getMostGenericTBAA 

when merging two TBAA tags, pointed out by Nuno.

llvm-svn: 171627
This commit is contained in:
Chris Lattner 2013-01-05 16:44:07 +00:00
parent 42e9611f15
commit 473988cf54
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
View File

@ -803,10 +803,10 @@ bool InstCombiner::SimplifyStoreAtEndOfBlock(StoreInst &SI) {
NewSI->setDebugLoc(OtherStore->getDebugLoc());
// If the two stores had the same TBAA tag, preserve it.
if (MDNode *TBAATag1 = SI.getMetadata(LLVMContext::MD_tbaa))
if (MDNode *TBAATag2 = OtherStore->getMetadata(LLVMContext::MD_tbaa))
if (TBAATag1 == TBAATag2)
NewSI->setMetadata(LLVMContext::MD_tbaa, TBAATag1);
if (MDNode *TBAATag = SI.getMetadata(LLVMContext::MD_tbaa))
if ((TBAATag = MDNode::getMostGenericTBAA(TBAATag,
OtherStore->getMetadata(LLVMContext::MD_tbaa))))
NewSI->setMetadata(LLVMContext::MD_tbaa, TBAATag);
// Nuke the old stores.

8
llvm/lib/Transforms/Scalar/LICM.cpp
View File

@ -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);
}
}

1
llvm/lib/Transforms/Utils/MetaRenamer.cpp
View File

@ -22,7 +22,6 @@
#include "llvm/IR/Type.h"
#include "llvm/Pass.h"
#include "llvm/TypeFinder.h"
using namespace llvm;
namespace {