[llvm-commits] [llvm] r159785 - /llvm/trunk/include/llvm/MC/MCAssembler.h

[Owen Anderson]

Author: resistor
Date: Thu Jul  5 17:30:42 2012
New Revision: 159785

URL: http://llvm.org/viewvc/llvm-project?rev=159785&view=rev
Log:
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.

Modified:
    llvm/trunk/include/llvm/MC/MCAssembler.h

Modified: llvm/trunk/include/llvm/MC/MCAssembler.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAssembler.h?rev=159785&r1=159784&r2=159785&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCAssembler.h (original)
+++ llvm/trunk/include/llvm/MC/MCAssembler.h Thu Jul  5 17:30:42 2012
@@ -130,7 +130,7 @@
 
   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);
   }