summaryrefslogtreecommitdiff
path: root/include/llvm/CodeGen/SlotIndexes.h
diff options
context:
space:
mode:
authorJakob Stoklund Olesen <stoklund@2pi.dk>2011-03-03 05:18:19 +0000
committerJakob Stoklund Olesen <stoklund@2pi.dk>2011-03-03 05:18:19 +0000
commita97ff8a027259b1b9e4dbdb5b6f01cc2195a6948 (patch)
treef4daea01d38e23fa6b8996bcf546bc05365cc204 /include/llvm/CodeGen/SlotIndexes.h
parentacf9f48c5e5fa2ce381d566aefc6285653ab2b5c (diff)
downloadllvm-a97ff8a027259b1b9e4dbdb5b6f01cc2195a6948.tar.gz
llvm-a97ff8a027259b1b9e4dbdb5b6f01cc2195a6948.tar.bz2
llvm-a97ff8a027259b1b9e4dbdb5b6f01cc2195a6948.tar.xz
Avoid comparing invalid slot indexes, and assert that it doesn't happen.
The SlotIndex created by the default construction does not represent a position in the function, and it doesn't make sense to compare it to other indexes. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@126924 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm/CodeGen/SlotIndexes.h')
-rw-r--r--include/llvm/CodeGen/SlotIndexes.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/llvm/CodeGen/SlotIndexes.h b/include/llvm/CodeGen/SlotIndexes.h
index 8d3b1c0933..153e520a47 100644
--- a/include/llvm/CodeGen/SlotIndexes.h
+++ b/include/llvm/CodeGen/SlotIndexes.h
@@ -135,6 +135,7 @@ namespace llvm {
}
IndexListEntry& entry() const {
+ assert(isValid() && "Attempt to compare reserved index.");
return *lie.getPointer();
}
@@ -530,7 +531,7 @@ namespace llvm {
/// Returns the instruction for the given index, or null if the given
/// index has no instruction associated with it.
MachineInstr* getInstructionFromIndex(SlotIndex index) const {
- return index.entry().getInstr();
+ return index.isValid() ? index.entry().getInstr() : 0;
}
/// Returns the next non-null index.