mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-20 03:23:01 +02:00
Fix fast-isel to avoid selecting the return instruction if a
tail call has been encountered. llvm-svn: 89444
This commit is contained in:
parent
0057f45c31
commit
d3d7358309
@ -127,7 +127,8 @@ private:
|
|||||||
|
|
||||||
void SelectBasicBlock(BasicBlock *LLVMBB,
|
void SelectBasicBlock(BasicBlock *LLVMBB,
|
||||||
BasicBlock::iterator Begin,
|
BasicBlock::iterator Begin,
|
||||||
BasicBlock::iterator End);
|
BasicBlock::iterator End,
|
||||||
|
bool &HadTailCall);
|
||||||
void CodeGenAndEmitDAG();
|
void CodeGenAndEmitDAG();
|
||||||
void LowerArguments(BasicBlock *BB);
|
void LowerArguments(BasicBlock *BB);
|
||||||
|
|
||||||
|
@ -376,7 +376,8 @@ static void copyCatchInfo(BasicBlock *SrcBB, BasicBlock *DestBB,
|
|||||||
|
|
||||||
void SelectionDAGISel::SelectBasicBlock(BasicBlock *LLVMBB,
|
void SelectionDAGISel::SelectBasicBlock(BasicBlock *LLVMBB,
|
||||||
BasicBlock::iterator Begin,
|
BasicBlock::iterator Begin,
|
||||||
BasicBlock::iterator End) {
|
BasicBlock::iterator End,
|
||||||
|
bool &HadTailCall) {
|
||||||
SDL->setCurrentBasicBlock(BB);
|
SDL->setCurrentBasicBlock(BB);
|
||||||
MetadataContext &TheMetadata = LLVMBB->getParent()->getContext().getMetadata();
|
MetadataContext &TheMetadata = LLVMBB->getParent()->getContext().getMetadata();
|
||||||
unsigned MDDbgKind = TheMetadata.getMDKind("dbg");
|
unsigned MDDbgKind = TheMetadata.getMDKind("dbg");
|
||||||
@ -421,6 +422,7 @@ void SelectionDAGISel::SelectBasicBlock(BasicBlock *LLVMBB,
|
|||||||
|
|
||||||
// Final step, emit the lowered DAG as machine code.
|
// Final step, emit the lowered DAG as machine code.
|
||||||
CodeGenAndEmitDAG();
|
CodeGenAndEmitDAG();
|
||||||
|
HadTailCall = SDL->HasTailCall;
|
||||||
SDL->clear();
|
SDL->clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -797,7 +799,16 @@ void SelectionDAGISel::SelectAllBasicBlocks(Function &Fn,
|
|||||||
}
|
}
|
||||||
|
|
||||||
SDL->setCurDebugLoc(FastIS->getCurDebugLoc());
|
SDL->setCurDebugLoc(FastIS->getCurDebugLoc());
|
||||||
SelectBasicBlock(LLVMBB, BI, next(BI));
|
|
||||||
|
bool HadTailCall = false;
|
||||||
|
SelectBasicBlock(LLVMBB, BI, next(BI), HadTailCall);
|
||||||
|
|
||||||
|
// If the call was emitted as a tail call, we're done with the block.
|
||||||
|
if (HadTailCall) {
|
||||||
|
BI = End;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
// If the instruction was codegen'd with multiple blocks,
|
// If the instruction was codegen'd with multiple blocks,
|
||||||
// inform the FastISel object where to resume inserting.
|
// inform the FastISel object where to resume inserting.
|
||||||
FastIS->setCurrentBlock(BB);
|
FastIS->setCurrentBlock(BB);
|
||||||
@ -827,7 +838,8 @@ void SelectionDAGISel::SelectAllBasicBlocks(Function &Fn,
|
|||||||
// If FastISel is run and it has known DebugLoc then use it.
|
// If FastISel is run and it has known DebugLoc then use it.
|
||||||
if (FastIS && !FastIS->getCurDebugLoc().isUnknown())
|
if (FastIS && !FastIS->getCurDebugLoc().isUnknown())
|
||||||
SDL->setCurDebugLoc(FastIS->getCurDebugLoc());
|
SDL->setCurDebugLoc(FastIS->getCurDebugLoc());
|
||||||
SelectBasicBlock(LLVMBB, BI, End);
|
bool HadTailCall;
|
||||||
|
SelectBasicBlock(LLVMBB, BI, End, HadTailCall);
|
||||||
}
|
}
|
||||||
|
|
||||||
FinishBasicBlock();
|
FinishBasicBlock();
|
||||||
|
13
test/CodeGen/X86/tailcall-fastisel.ll
Normal file
13
test/CodeGen/X86/tailcall-fastisel.ll
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
; RUN: llc < %s -march=x86-64 -tailcallopt -fast-isel | grep TAILCALL
|
||||||
|
|
||||||
|
; Fast-isel shouldn't attempt to handle this tail call, and it should
|
||||||
|
; cleanly terminate instruction selection in the block after it's
|
||||||
|
; done to avoid emitting invalid MachineInstrs.
|
||||||
|
|
||||||
|
%0 = type { i64, i32, i8* }
|
||||||
|
|
||||||
|
define fastcc i8* @"visit_array_aux<`Reference>"(%0 %arg, i32 %arg1) nounwind {
|
||||||
|
fail: ; preds = %entry
|
||||||
|
%tmp20 = tail call fastcc i8* @"visit_array_aux<`Reference>"(%0 %arg, i32 undef) ; <i8*> [#uses=1]
|
||||||
|
ret i8* %tmp20
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user