diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2013-06-07 18:18:12 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2013-06-07 18:18:12 +0000 |
| commit | 2e0cebd8817bb8bd61a23597bcae6bab9b2845a6 (patch) | |
| tree | d76d8f0676538d63b222306709b96f336fe75e36 /lib/Target/R600/R600OptimizeVectorRegisters.cpp | |
| parent | 149d1a1894a92872ad5d28c452e813d34c3d2658 (diff) | |
| download | llvm-2e0cebd8817bb8bd61a23597bcae6bab9b2845a6.tar.gz llvm-2e0cebd8817bb8bd61a23597bcae6bab9b2845a6.tar.bz2 llvm-2e0cebd8817bb8bd61a23597bcae6bab9b2845a6.tar.xz | |
Vincent says the element is at most once in the vector, so we don't need a full std::remove.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183541 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/R600/R600OptimizeVectorRegisters.cpp')
| -rw-r--r-- | lib/Target/R600/R600OptimizeVectorRegisters.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/Target/R600/R600OptimizeVectorRegisters.cpp b/lib/Target/R600/R600OptimizeVectorRegisters.cpp index 0c123a101e..726cfbcdf3 100644 --- a/lib/Target/R600/R600OptimizeVectorRegisters.cpp +++ b/lib/Target/R600/R600OptimizeVectorRegisters.cpp @@ -198,9 +198,13 @@ MachineInstr *R600VectorRegMerger::RebuildVector( .addReg(SubReg) .addImm(Chan); UpdatedRegToChan[SubReg] = Chan; - UpdatedUndef.erase( - std::remove(UpdatedUndef.begin(), UpdatedUndef.end(), Chan), - UpdatedUndef.end()); + std::vector<unsigned>::iterator ChanPos = + std::find(UpdatedUndef.begin(), UpdatedUndef.end(), Chan); + if (ChanPos != UpdatedUndef.end()) + UpdatedUndef.erase(ChanPos); + assert(std::find(UpdatedUndef.begin(), UpdatedUndef.end(), Chan) == + UpdatedUndef.end() && + "UpdatedUndef shouldn't contain Chan more than once!"); DEBUG(dbgs() << " ->"; Tmp->dump();); (void)Tmp; SrcVec = DstReg; |