diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp
index 5e721bc4fc0..a8aa21a96ae 100644
--- a/lib/CodeGen/LiveIntervalAnalysis.cpp
+++ b/lib/CodeGen/LiveIntervalAnalysis.cpp
@@ -970,7 +970,7 @@ void LiveIntervals::handleMove(MachineInstr *mi) {
 
   MachineBasicBlock* mbb = mi->getParent();
   
-  assert(getMBBFromIndex(origIdx) == mbb &&
+  assert(getMBBStartIdx(mbb) <= origIdx && origIdx < getMBBEndIdx(mbb) &&
          "Cannot handle moves across basic block boundaries.");
   assert(!mi->isBundled() && "Can't handle bundled instructions yet.");