commit e43702695dd4500c2a11671f9d353b5cc6b2603b
author Chris Lattner <sabre@nondot.org> Sat May 14 12:25:32 2005 +0000
committer Chris Lattner <sabre@nondot.org> Sat May 14 12:25:32 2005 +0000
tree 41d38fa9675b7212e2d875eee28e2ebfb7ff5b0e
parent 16d0db2da8c274f98db4a89ca7a92f970d464b9a

preserve calling conventions when hacking on code


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@22024 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Transforms/Scalar/ADCE.cpp

diff --git a/lib/Transforms/Scalar/ADCE.cpp b/lib/Transforms/Scalar/ADCE.cpp
index 7307ff8..65e816e 100644
--- a/lib/Transforms/Scalar/ADCE.cpp
+++ b/lib/Transforms/Scalar/ADCE.cpp
@@ -188,7 +188,8 @@
           // after it to the normal destination.
           std::vector<Value*> Args(II->op_begin()+3, II->op_end());
           std::string Name = II->getName(); II->setName("");
-          Instruction *NewCall = new CallInst(F, Args, Name, II);
+          CallInst *NewCall = new CallInst(F, Args, Name, II);
+          NewCall->setCallingConv(II->getCallingConv());
           II->replaceAllUsesWith(NewCall);
           new BranchInst(II->getNormalDest(), II);
 

lib/Transforms/Scalar/InstructionCombining.cpp

diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp
index 2077b32..218910f 100644
--- a/lib/Transforms/Scalar/InstructionCombining.cpp
+++ b/lib/Transforms/Scalar/InstructionCombining.cpp
@@ -4271,10 +4271,12 @@
   if (InvokeInst *II = dyn_cast<InvokeInst>(Caller)) {
     NC = new InvokeInst(Callee, II->getNormalDest(), II->getUnwindDest(),
                         Args, Caller->getName(), Caller);
+    cast<InvokeInst>(II)->setCallingConv(II->getCallingConv());
   } else {
     NC = new CallInst(Callee, Args, Caller->getName(), Caller);
     if (cast<CallInst>(Caller)->isTailCall())
       cast<CallInst>(NC)->setTailCall();
+   cast<CallInst>(NC)->setCallingConv(cast<CallInst>(Caller)->getCallingConv());
   }
 
   // Insert a cast of the return type as necessary...