Fix PR1146: parameter attributes are longer part of

the function type, instead they belong to functions
and function calls.  This is an updated and slightly
corrected version of Reid Spencer's original patch.
The only known problem is that auto-upgrading of
bitcode files doesn't seem to work properly (see
test/Bitcode/AutoUpgradeIntrinsics.ll).  Hopefully
a bitcode guru (who might that be? :) ) will fix it.

llvm-svn: 44359

1 files changed, 2 insertions, 0 deletions

diff --git a/llvm/lib/Transforms/Scalar/LowerGC.cpp b/llvm/lib/Transforms/Scalar/LowerGC.cpp
index bac7ac799bd..aff3f2cb301 100644
--- a/llvm/lib/Transforms/Scalar/LowerGC.cpp
+++ b/llvm/lib/Transforms/Scalar/LowerGC.cpp
@@ -339,6 +339,8 @@ bool LowerGC::runOnFunction(Function &F) {
 
       Value *II = new InvokeInst(CI->getCalledValue(), NewBB, Cleanup,
                                  Args.begin(), Args.end(), CI->getName(), CBB);
+      cast<InvokeInst>(II)->setCallingConv(CI->getCallingConv());
+      cast<InvokeInst>(II)->setParamAttrs(CI->getParamAttrs());
       CI->replaceAllUsesWith(II);
       delete CI;
     }