aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOwen Anderson <resistor@mac.com>2012-07-05 22:30:42 +0000
committerOwen Anderson <resistor@mac.com>2012-07-05 22:30:42 +0000
commit94edc64ba23f71c31d5dee0b6942584a14cedcb5 (patch)
tree2e8d0342cff9910aa848b13fa2cb12fbdbde2519
parentd45e37a0a567ece390bd84c32a5276ee75a0c952 (diff)
downloadexternal_llvm-94edc64ba23f71c31d5dee0b6942584a14cedcb5.zip
external_llvm-94edc64ba23f71c31d5dee0b6942584a14cedcb5.tar.gz
external_llvm-94edc64ba23f71c31d5dee0b6942584a14cedcb5.tar.bz2
Fix an overzealous assertion. It is legitimate for a target to have multiple fixups on a single instruction that target the same byte, so long as their bit-offsets are coordinates appropriately.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@159785 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/llvm/MC/MCAssembler.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/llvm/MC/MCAssembler.h b/include/llvm/MC/MCAssembler.h
index 4ab7f91..b7b2d66 100644
--- a/include/llvm/MC/MCAssembler.h
+++ b/include/llvm/MC/MCAssembler.h
@@ -130,7 +130,7 @@ public:
void addFixup(MCFixup Fixup) {
// Enforce invariant that fixups are in offset order.
- assert((Fixups.empty() || Fixup.getOffset() > Fixups.back().getOffset()) &&
+ assert((Fixups.empty() || Fixup.getOffset() >= Fixups.back().getOffset()) &&
"Fixups must be added in order!");
Fixups.push_back(Fixup);
}