[llvm-commits] CVS: llvm/lib/Transforms/Utils/SimplifyCFG.cpp

[Chris Lattner]

Changes in directory llvm/lib/Transforms/Utils:

SimplifyCFG.cpp updated: 1.69 -> 1.70
---
Log message:

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.


---
Diffs of the changes:  (+2 -0)

 SimplifyCFG.cpp |    2 ++
 1 files changed, 2 insertions(+)


Index: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
diff -u llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.69 llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.70
--- llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.69	Thu Apr 21 18:45:34 2005
+++ llvm/lib/Transforms/Utils/SimplifyCFG.cpp	Sat May 14 07:21:56 2005
@@ -1066,6 +1066,7 @@
           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 @@
             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;