Make sure to preserve the calling convention when changing an invoke into

a call.  This fixes Prolangs-C++/deriv2, kimwitu++, and Misc-C++/bigfib
on X86 with -enable-x86-fastcc.

llvm-svn: 22023
This commit is contained in:
Chris Lattner 2005-05-14 12:21:56 +00:00
parent 9d106c705d
commit 214f1a8cf9

View File

@ -1066,6 +1066,7 @@ bool llvm::SimplifyCFG(BasicBlock *BB) {
std::vector<Value*> Args(II->op_begin()+3, II->op_end());
CallInst *CI = new CallInst(II->getCalledValue(), Args,
II->getName(), BI);
CI->setCallingConv(II->getCallingConv());
// If the invoke produced a value, the Call now does instead
II->replaceAllUsesWith(CI);
delete II;
@ -1280,6 +1281,7 @@ bool llvm::SimplifyCFG(BasicBlock *BB) {
std::vector<Value*> Args(II->op_begin()+3, II->op_end());
CallInst *CI = new CallInst(II->getCalledValue(), Args,
II->getName(), BI);
CI->setCallingConv(II->getCallingConv());
// If the invoke produced a value, the Call does now instead.
II->replaceAllUsesWith(CI);
delete II;