RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 19:52:54 +01:00
Code Issues Projects Releases Wiki Activity

NewGVN: Fixup some small issues

Browse Source 
llvm-svn: 299684
This commit is contained in:
Daniel Berlin 2017-04-06 18:52:55 +00:00
parent 4fa43561c2
commit 20dada1f07
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/Transforms/Scalar/NewGVN.cpp
View File

@ -2948,27 +2948,21 @@ bool NewGVN::eliminateInstructions(Function &F) {
// are left.
Value *Leader = CC->RepStoredValue ? CC->RepStoredValue : CC->RepLeader;
if (alwaysAvailable(Leader)) {
SmallPtrSet<Value *, 4> MembersLeft;
CongruenceClass::MemberSet MembersLeft;
for (auto M : CC->Members) {
Value *Member = M;
// Void things have no uses we can replace.
if (Member == Leader || Member->getType()->isVoidTy()) {
if (Member == Leader || !isa<Instruction>(Member) ||
Member->getType()->isVoidTy()) {
MembersLeft.insert(Member);
continue;
}
DEBUG(dbgs() << "Found replacement " << *(Leader) << " for " << *Member
<< "\n");
// Due to equality propagation, these may not always be
// instructions, they may be real values. We don't really
// care about trying to replace the non-instructions.
if (auto *I = dyn_cast<Instruction>(Member)) {
assert(Leader != I && "About to accidentally remove our leader");
replaceInstruction(I, Leader);
AnythingReplaced = true;
continue;
} else {
MembersLeft.insert(I);
}
auto *I = cast<Instruction>(Member);
assert(Leader != I && "About to accidentally remove our leader");
replaceInstruction(I, Leader);
AnythingReplaced = true;
}
CC->Members.swap(MembersLeft);
} else {
@ -3114,15 +3108,11 @@ bool NewGVN::eliminateInstructions(Function &F) {
markInstructionForDeletion(I);
// Cleanup the congruence class.
SmallPtrSet<Value *, 4> MembersLeft;
for (Value *Member : CC->Members) {
if (Member->getType()->isVoidTy()) {
CongruenceClass::MemberSet MembersLeft;
for (auto *Member : CC->Members)
if (!isa<Instruction>(Member) ||
!InstructionsToErase.count(cast<Instruction>(Member)))
MembersLeft.insert(Member);
continue;
}
MembersLeft.insert(Member);
}
CC->Members.swap(MembersLeft);
// If we have possible dead stores to look at, try to eliminate them.