projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MachineVerifier: Streamline live interval related error reporting
[oota-llvm.git]
/
lib
/
CodeGen
/
SlotIndexes.cpp
diff --git
a/lib/CodeGen/SlotIndexes.cpp
b/lib/CodeGen/SlotIndexes.cpp
index c4f3aec3d0e7b1292dc675519a6ecbc979d7696c..c9d23f67bdee38a944c1839532842fa7722e750c 100644
(file)
--- a/
lib/CodeGen/SlotIndexes.cpp
+++ b/
lib/CodeGen/SlotIndexes.cpp
@@
-7,8
+7,6
@@
//
//===----------------------------------------------------------------------===//
//
//===----------------------------------------------------------------------===//
-#define DEBUG_TYPE "slotindexes"
-
#include "llvm/CodeGen/SlotIndexes.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/CodeGen/MachineFunction.h"
#include "llvm/CodeGen/SlotIndexes.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/CodeGen/MachineFunction.h"
@@
-18,6
+16,8
@@
using namespace llvm;
using namespace llvm;
+#define DEBUG_TYPE "slotindexes"
+
char SlotIndexes::ID = 0;
INITIALIZE_PASS(SlotIndexes, "slotindexes",
"Slot index numbering", false, false)
char SlotIndexes::ID = 0;
INITIALIZE_PASS(SlotIndexes, "slotindexes",
"Slot index numbering", false, false)
@@
-127,7
+127,7
@@
void SlotIndexes::renumberIndexes() {
void SlotIndexes::renumberIndexes(IndexList::iterator curItr) {
// Number indexes with half the default spacing so we can catch up quickly.
const unsigned Space = SlotIndex::InstrDist/2;
void SlotIndexes::renumberIndexes(IndexList::iterator curItr) {
// Number indexes with half the default spacing so we can catch up quickly.
const unsigned Space = SlotIndex::InstrDist/2;
-
assert((Space & 3) == 0 &&
"InstrDist must be a multiple of 2*NUM");
+
static_assert((Space & 3) == 0,
"InstrDist must be a multiple of 2*NUM");
IndexList::iterator startItr = std::prev(curItr);
unsigned index = startItr->getIndex();
IndexList::iterator startItr = std::prev(curItr);
unsigned index = startItr->getIndex();
@@
-172,8
+172,8
@@
void SlotIndexes::repairIndexesInRange(MachineBasicBlock *MBB,
// optionally includes an additional position prior to MBB->begin(), indicated
// by the includeStart flag. This is done so that we can iterate MIs in a MBB
// in parallel with SlotIndexes, but there should be a better way to do this.
// optionally includes an additional position prior to MBB->begin(), indicated
// by the includeStart flag. This is done so that we can iterate MIs in a MBB
// in parallel with SlotIndexes, but there should be a better way to do this.
- IndexList::iterator ListB = startIdx.listEntry();
- IndexList::iterator ListI = endIdx.listEntry();
+ IndexList::iterator ListB = startIdx.listEntry()
->getIterator()
;
+ IndexList::iterator ListI = endIdx.listEntry()
->getIterator()
;
MachineBasicBlock::iterator MBBI = End;
bool pastStart = false;
while (ListI != ListB || MBBI != Begin || (includeStart && !pastStart)) {
MachineBasicBlock::iterator MBBI = End;
bool pastStart = false;
while (ListI != ListB || MBBI != Begin || (includeStart && !pastStart)) {