Document assumption in X86FrameLowering::inlineStackProbe()

dexonsmith · dexonsmith · commit 17ef67672c99 · 2016-02-22T02:32:35.000Z
Resolve FIXME from r261504. Apparently bundled instructions are illegal here: http://lists.llvm.org/pipermail/llvm-commits/Week-of-Mon-20160215/334146.html git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@261507 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/X86/X86FrameLowering.cpp b/lib/Target/X86/X86FrameLowering.cpp
@@ -462,7 +462,8 @@ void X86FrameLowering::inlineStackProbe(MachineFunction &MF,
   }
 
   if (ChkStkStub != nullptr) {
-    // FIXME: MBBI is a bundle iterator.  Should this be getBundleIterator()?
+    assert(!ChkStkStub->isBundled() &&
+           "Not expecting bundled instructions here");
     MachineBasicBlock::iterator MBBI =
         std::next(ChkStkStub->getInstrIterator());
     assert(std::prev(MBBI).operator==(ChkStkStub) &&

Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,8 @@ void X86FrameLowering::inlineStackProbe(MachineFunction &MF,`
`462`	`462`	`}`
`463`	`463`
`464`	`464`	`if (ChkStkStub != nullptr) {`
`465`		`- // FIXME: MBBI is a bundle iterator. Should this be getBundleIterator()?`
	`465`	`+ assert(!ChkStkStub->isBundled() &&`
	`466`	`+ "Not expecting bundled instructions here");`
`466`	`467`	`MachineBasicBlock::iterator MBBI =`
`467`	`468`	`std::next(ChkStkStub->getInstrIterator());`
`468`	`469`	`assert(std::prev(MBBI).operator==(ChkStkStub) &&`