diff options
| author | Nick Lewycky <nicholas@mxc.ca> | 2009-06-12 16:04:00 +0000 |
|---|---|---|
| committer | Nick Lewycky <nicholas@mxc.ca> | 2009-06-12 16:04:00 +0000 |
| commit | b3c36c9c9aba3fce8ae35b52eda4192531a9d3df (patch) | |
| tree | e8846346fb08d04e70e0a60e8133a166c0106a2b /lib/Transforms/IPO/MergeFunctions.cpp | |
| parent | 8728d7a3ea7cad3297f9ab0984358007238ae83a (diff) | |
Don't forget to match the calling convention when producing a thunk.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@73231 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/IPO/MergeFunctions.cpp')
| -rw-r--r-- | lib/Transforms/IPO/MergeFunctions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Transforms/IPO/MergeFunctions.cpp b/lib/Transforms/IPO/MergeFunctions.cpp index e237fcde02..a1d91c256e 100644 --- a/lib/Transforms/IPO/MergeFunctions.cpp +++ b/lib/Transforms/IPO/MergeFunctions.cpp @@ -478,6 +478,7 @@ static void ThunkGToF(Function *F, Function *G) { CallInst *CI = CallInst::Create(F, Args.begin(), Args.end(), "", BB); CI->setTailCall(); + CI->setCallingConv(F->getCallingConv()); if (NewG->getReturnType() == Type::VoidTy) { ReturnInst::Create(BB); } else if (CI->getType() != NewG->getReturnType()) { @@ -492,8 +493,7 @@ static void ThunkGToF(Function *F, Function *G) { G->replaceAllUsesWith(NewG); G->eraseFromParent(); - // TODO: look at direct callers to G and make them all direct callers to F - // iff G->hasAddressTaken() is false. + // TODO: look at direct callers to G and make them all direct callers to F. } static void AliasGToF(Function *F, Function *G) { |