RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-21 12:02:58 +02:00
Code Issues Projects Releases Wiki Activity

Revert the business end of r164634, and replace it with a different fix. The

Browse Source 
reason we were getting two of the same alloca is because of a memmove/memcpy
which had the same alloca in both the src and dest. Now we detect that case
directly. This has the same testcase as before, but fixes a clang test
CodeGenObjC/exceptions.m which runs clang -O2.

llvm-svn: 164636
This commit is contained in:
Nick Lewycky 2012-09-25 21:50:37 +00:00
parent 0c83ee116c
commit 4dfea84927
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Transforms/Scalar/SROA.cpp
View File

@ -2228,7 +2228,10 @@ private:
// alloca that should be re-examined after rewriting this instruction.
if (AllocaInst *AI
= dyn_cast<AllocaInst>(OtherPtr->stripInBoundsOffsets()))
Pass.Worklist.insert(AI);
// Don't revisit the alloca if both sides of the memory transfer are
// referring to the same alloca.
if (AI != &NewAI)
Pass.Worklist.insert(AI);
if (EmitMemCpy) {
Value *OurPtr
@ -3108,12 +3111,6 @@ bool SROA::promoteAllocas(Function &F) {
if (PromotableAllocas.empty())
return false;
// Ensure that the list is unique.
std::sort(PromotableAllocas.begin(), PromotableAllocas.end());
PromotableAllocas.erase(std::unique(PromotableAllocas.begin(),
PromotableAllocas.end()),
PromotableAllocas.end());
NumPromoted += PromotableAllocas.size();
if (DT && !ForceSSAUpdater) {