1872096f1e
Now that MachineBasicBlock::reverse_instr_iterator knows when it's at
the end (since r281168 and r281170), implement
MachineBasicBlock::reverse_iterator directly on top of an
ilist::reverse_iterator by adding an IsReverse template parameter to
MachineInstrBundleIterator. This replaces another hard-to-reason-about
use of std::reverse_iterator on list iterators, matching the changes for
ilist::reverse_iterator from r280032 (see the "out of scope" section at
the end of that commit message). MachineBasicBlock::reverse_iterator
now has a handle to the current node and has obvious invalidation
semantics.
r280032 has a more detailed explanation of how list-style reverse
iterators (invalidated when the pointed-at node is deleted) are
different from vector-style reverse iterators like std::reverse_iterator
(invalidated on every operation). A great motivating example is this
commit's changes to lib/CodeGen/DeadMachineInstructionElim.cpp.
Note: If your out-of-tree backend deletes instructions while iterating
on a MachineBasicBlock::reverse_iterator or converts between
MachineBasicBlock::iterator and MachineBasicBlock::reverse_iterator,
you'll need to update your code in similar ways to r280032. The
following table might help:
[Old] ==> [New]
delete &*RI, RE = end() delete &*RI++
RI->erase(), RE = end() RI++->erase()
reverse_iterator(I) std::prev(I).getReverse()
reverse_iterator(I) ++I.getReverse()
--reverse_iterator(I) I.getReverse()
reverse_iterator(std::next(I)) I.getReverse()
RI.base() std::prev(RI).getReverse()
RI.base() ++RI.getReverse()
--RI.base() RI.getReverse()
std::next(RI).base() RI.getReverse()
(For more details, have a look at r280032.)
llvm-svn: 281172
134 lines
4.6 KiB
C++
134 lines
4.6 KiB
C++
//===- MachineInstrBundleIteratorTest.cpp ---------------------------------===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "llvm/ADT/ilist_node.h"
|
|
#include "llvm/CodeGen/MachineInstrBundleIterator.h"
|
|
#include "gtest/gtest.h"
|
|
|
|
using namespace llvm;
|
|
|
|
namespace {
|
|
|
|
struct MyBundledInstr
|
|
: public ilist_node<MyBundledInstr, ilist_sentinel_tracking<true>> {
|
|
bool isBundledWithPred() const { return true; }
|
|
bool isBundledWithSucc() const { return true; }
|
|
};
|
|
typedef MachineInstrBundleIterator<MyBundledInstr> bundled_iterator;
|
|
typedef MachineInstrBundleIterator<const MyBundledInstr> const_bundled_iterator;
|
|
typedef MachineInstrBundleIterator<MyBundledInstr, true>
|
|
reverse_bundled_iterator;
|
|
typedef MachineInstrBundleIterator<const MyBundledInstr, true>
|
|
const_reverse_bundled_iterator;
|
|
|
|
#ifdef GTEST_HAS_DEATH_TEST
|
|
#ifndef NDEBUG
|
|
TEST(MachineInstrBundleIteratorTest, CheckForBundles) {
|
|
MyBundledInstr MBI;
|
|
auto I = MBI.getIterator();
|
|
auto RI = I.getReverse();
|
|
|
|
// Confirm that MBI is always considered bundled.
|
|
EXPECT_TRUE(MBI.isBundledWithPred());
|
|
EXPECT_TRUE(MBI.isBundledWithSucc());
|
|
|
|
// Confirm that iterators check in their constructor for bundled iterators.
|
|
EXPECT_DEATH((void)static_cast<bundled_iterator>(I),
|
|
"not legal to initialize");
|
|
EXPECT_DEATH((void)static_cast<bundled_iterator>(MBI),
|
|
"not legal to initialize");
|
|
EXPECT_DEATH((void)static_cast<bundled_iterator>(&MBI),
|
|
"not legal to initialize");
|
|
EXPECT_DEATH((void)static_cast<const_bundled_iterator>(I),
|
|
"not legal to initialize");
|
|
EXPECT_DEATH((void)static_cast<const_bundled_iterator>(MBI),
|
|
"not legal to initialize");
|
|
EXPECT_DEATH((void)static_cast<const_bundled_iterator>(&MBI),
|
|
"not legal to initialize");
|
|
EXPECT_DEATH((void)static_cast<reverse_bundled_iterator>(RI),
|
|
"not legal to initialize");
|
|
EXPECT_DEATH((void)static_cast<reverse_bundled_iterator>(MBI),
|
|
"not legal to initialize");
|
|
EXPECT_DEATH((void)static_cast<reverse_bundled_iterator>(&MBI),
|
|
"not legal to initialize");
|
|
EXPECT_DEATH((void)static_cast<const_reverse_bundled_iterator>(RI),
|
|
"not legal to initialize");
|
|
EXPECT_DEATH((void)static_cast<const_reverse_bundled_iterator>(MBI),
|
|
"not legal to initialize");
|
|
EXPECT_DEATH((void)static_cast<const_reverse_bundled_iterator>(&MBI),
|
|
"not legal to initialize");
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
TEST(MachineInstrBundleIteratorTest, CompareToBundledMI) {
|
|
MyBundledInstr MBI;
|
|
const MyBundledInstr &CMBI = MBI;
|
|
bundled_iterator I;
|
|
const_bundled_iterator CI;
|
|
|
|
// Confirm that MBI is always considered bundled.
|
|
EXPECT_TRUE(MBI.isBundledWithPred());
|
|
EXPECT_TRUE(MBI.isBundledWithSucc());
|
|
|
|
// These invocations will crash when !NDEBUG if a conversion is taking place.
|
|
// These checks confirm that comparison operators don't use any conversion
|
|
// operators.
|
|
ASSERT_FALSE(MBI == I);
|
|
ASSERT_FALSE(&MBI == I);
|
|
ASSERT_FALSE(CMBI == I);
|
|
ASSERT_FALSE(&CMBI == I);
|
|
ASSERT_FALSE(I == MBI);
|
|
ASSERT_FALSE(I == &MBI);
|
|
ASSERT_FALSE(I == CMBI);
|
|
ASSERT_FALSE(I == &CMBI);
|
|
ASSERT_FALSE(MBI == CI);
|
|
ASSERT_FALSE(&MBI == CI);
|
|
ASSERT_FALSE(CMBI == CI);
|
|
ASSERT_FALSE(&CMBI == CI);
|
|
ASSERT_FALSE(CI == MBI);
|
|
ASSERT_FALSE(CI == &MBI);
|
|
ASSERT_FALSE(CI == CMBI);
|
|
ASSERT_FALSE(CI == &CMBI);
|
|
ASSERT_FALSE(MBI.getIterator() == I);
|
|
ASSERT_FALSE(CMBI.getIterator() == I);
|
|
ASSERT_FALSE(I == MBI.getIterator());
|
|
ASSERT_FALSE(I == CMBI.getIterator());
|
|
ASSERT_FALSE(MBI.getIterator() == CI);
|
|
ASSERT_FALSE(CMBI.getIterator() == CI);
|
|
ASSERT_FALSE(CI == MBI.getIterator());
|
|
ASSERT_FALSE(CI == CMBI.getIterator());
|
|
ASSERT_TRUE(MBI != I);
|
|
ASSERT_TRUE(&MBI != I);
|
|
ASSERT_TRUE(CMBI != I);
|
|
ASSERT_TRUE(&CMBI != I);
|
|
ASSERT_TRUE(I != MBI);
|
|
ASSERT_TRUE(I != &MBI);
|
|
ASSERT_TRUE(I != CMBI);
|
|
ASSERT_TRUE(I != &CMBI);
|
|
ASSERT_TRUE(MBI != CI);
|
|
ASSERT_TRUE(&MBI != CI);
|
|
ASSERT_TRUE(CMBI != CI);
|
|
ASSERT_TRUE(&CMBI != CI);
|
|
ASSERT_TRUE(CI != MBI);
|
|
ASSERT_TRUE(CI != &MBI);
|
|
ASSERT_TRUE(CI != CMBI);
|
|
ASSERT_TRUE(CI != &CMBI);
|
|
ASSERT_TRUE(MBI.getIterator() != I);
|
|
ASSERT_TRUE(CMBI.getIterator() != I);
|
|
ASSERT_TRUE(I != MBI.getIterator());
|
|
ASSERT_TRUE(I != CMBI.getIterator());
|
|
ASSERT_TRUE(MBI.getIterator() != CI);
|
|
ASSERT_TRUE(CMBI.getIterator() != CI);
|
|
ASSERT_TRUE(CI != MBI.getIterator());
|
|
ASSERT_TRUE(CI != CMBI.getIterator());
|
|
}
|
|
|
|
} // end namespace
|