From ca968393ab924439f26086dea46ceebebcd148c2 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 13 May 2005 06:27:02 +0000 Subject: [PATCH] When lowering invokes to calls, amke sure to preserve the calling conv. This fixes Ptrdist/anagram with x86 llcbeta llvm-svn: 21925 --- llvm/lib/Transforms/Scalar/LowerInvoke.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/llvm/lib/Transforms/Scalar/LowerInvoke.cpp b/llvm/lib/Transforms/Scalar/LowerInvoke.cpp index 2738b4aa5e3b..b0c807f958a6 100644 --- a/llvm/lib/Transforms/Scalar/LowerInvoke.cpp +++ b/llvm/lib/Transforms/Scalar/LowerInvoke.cpp @@ -205,9 +205,10 @@ bool LowerInvoke::insertCheapEHSupport(Function &F) { if (InvokeInst *II = dyn_cast(BB->getTerminator())) { // Insert a normal call instruction... std::string Name = II->getName(); II->setName(""); - Value *NewCall = new CallInst(II->getCalledValue(), - std::vector(II->op_begin()+3, - II->op_end()), Name,II); + CallInst *NewCall = new CallInst(II->getCalledValue(), + std::vector(II->op_begin()+3, + II->op_end()), Name, II); + NewCall->setCallingConv(II->getCallingConv()); II->replaceAllUsesWith(NewCall); // Insert an unconditional branch to the normal destination. @@ -286,10 +287,11 @@ bool LowerInvoke::insertExpensiveEHSupport(Function &F) { // Insert a normal call instruction on the normal execution path. std::string Name = II->getName(); II->setName(""); - Value *NewCall = new CallInst(II->getCalledValue(), - std::vector(II->op_begin()+3, - II->op_end()), Name, - InsertLoc); + CallInst *NewCall = new CallInst(II->getCalledValue(), + std::vector(II->op_begin()+3, + II->op_end()), Name, + InsertLoc); + NewCall->setCallingConv(II->getCallingConv()); II->replaceAllUsesWith(NewCall); // If we got this far, then no exception was thrown and we can pop our