Commit 38581964 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r242410: 

------------------------------------------------------------------------
r242410 | tstellar | 2015-07-16 08:38:29 -0700 (Thu, 16 Jul 2015) | 13 lines

AMDPGU/R600: Replace llvm_unreachable() call with LLVMContext::emitError()

Summary:
This fixes an issue on MIPS where the infinite-loop-evergreen.ll test
was failing to terminate.

Fixes PR24147.

Reviewers: arsenm, dsanders

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D11260
------------------------------------------------------------------------

llvm-svn: 242453
parent d2209345

llvm/lib/Target/AMDGPU/AMDILCFGStructurizer.cpp

+3 −12
Original line number Diff line number Diff line
@@ -1732,18 +1732,9 @@ AMDGPUCFGStructurizer::normalizeInfiniteLoopExit(MachineLoop* LoopRep) { 
  FuncRep->push_back(DummyExitBlk);  //insert to function

  SHOWNEWBLK(DummyExitBlk, "DummyExitBlock to normalize infiniteLoop: ");

  DEBUG(dbgs() << "Old branch instr: " << *BranchMI << "\n";);

  MachineBasicBlock::iterator I = BranchMI;

  unsigned ImmReg = FuncRep->getRegInfo().createVirtualRegister(I32RC);

  llvm_unreachable("Extra register needed to handle CFG");

  MachineInstr *NewMI = insertInstrBefore(I, AMDGPU::BRANCH_COND_i32);

  MachineInstrBuilder MIB(*FuncRep, NewMI);

  MIB.addMBB(LoopHeader);

  MIB.addReg(ImmReg, false);

  SHOWNEWINSTR(NewMI);

  BranchMI->eraseFromParent();

  LoopLatch->addSuccessor(DummyExitBlk);



  return DummyExitBlk;

  LLVMContext &Ctx = LoopHeader->getParent()->getFunction()->getContext();

  Ctx.emitError("Extra register needed to handle CFG");

  return nullptr;

}



void AMDGPUCFGStructurizer::removeUnconditionalBranch(MachineBasicBlock *MBB) {