void shuffle(Iterator first, Iterator last, RNG &&g) {
// It would be better to use a std::uniform_int_distribution,
// but that would be stdlib dependent.
- for (auto size = last - first; size > 1; ++first, (void)--size)
- std::iter_swap(first, first + g() % size);
+ typedef
+ typename std::iterator_traits<Iterator>::difference_type difference_type;
+ for (auto size = last - first; size > 1; ++first, (void)--size) {
+ difference_type offset = g() % size;
+ // Avoid self-assignment due to incorrect assertions in libstdc++
+ // containers (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85828).
+ if (offset != difference_type(0))
+ std::iter_swap(first, first + offset);
+ }
}
/// Find the length of an array.
template <class IteratorTy>
inline void presortShuffle(IteratorTy Start, IteratorTy End) {
std::mt19937 Generator(presortShuffleEntropy());
- std::shuffle(Start, End, Generator);
+ llvm::shuffle(Start, End, Generator);
}
} // end namespace detail
//
// Step 1: Randomize the order of the optimizer passes.
//
- std::shuffle(PassesToRun.begin(), PassesToRun.end(), randomness);
+ llvm::shuffle(PassesToRun.begin(), PassesToRun.end(), randomness);
//
// Step 2: Run optimizer passes on the program and check for success.
// distribution (improving the speed of convergence).
if (ShufflingEnabled && NumOfIterationsWithoutProgress > MaxIterations) {
std::vector<ElTy> ShuffledList(TheList);
- std::shuffle(ShuffledList.begin(), ShuffledList.end(), randomness);
+ llvm::shuffle(ShuffledList.begin(), ShuffledList.end(), randomness);
errs() << "\n\n*** Testing shuffled set...\n\n";
// Check that random shuffle doesn't lose the bug
Expected<TestResult> Result = doTest(ShuffledList, empty);
std::vector<unsigned> Opcodes;
Opcodes.resize(State.getInstrInfo().getNumOpcodes());
std::iota(Opcodes.begin(), Opcodes.end(), 0U);
- std::shuffle(Opcodes.begin(), Opcodes.end(), randomGenerator());
+ llvm::shuffle(Opcodes.begin(), Opcodes.end(), randomGenerator());
std::vector<const Instruction *> AliasingInstructions;
for (const unsigned OtherOpcode : Opcodes) {
BoolInst.push_back(&Instr);
}
- std::shuffle(BoolInst.begin(), BoolInst.end(), R);
+ llvm::shuffle(BoolInst.begin(), BoolInst.end(), R);
for (auto *Instr : BoolInst) {
BasicBlock *Curr = Instr->getParent();