diff options
| author | Mike Stump <mrs@apple.com> | 2009-11-02 23:47:45 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@apple.com> | 2009-11-02 23:47:45 +0000 |
| commit | f49ed94751d366dc3fcb3d1197830a49e8b3e0de (patch) | |
| tree | ff4880aae0c584e781890a9d8e36fb37285412ad /lib/CodeGen/CGCXX.cpp | |
| parent | c5dac4e235806cc192fe67123d551be7ae66e162 (diff) | |
Add basic codegen for thunks that return values.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@85842 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGCXX.cpp')
| -rw-r--r-- | lib/CodeGen/CGCXX.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp index 56e039d2f2..d748c01fb3 100644 --- a/lib/CodeGen/CGCXX.cpp +++ b/lib/CodeGen/CGCXX.cpp @@ -752,12 +752,15 @@ llvm::Constant *CodeGenFunction::GenerateCovariantThunk(llvm::Function *Fn, CallArgs.push_back(std::make_pair(EmitCallArg(Arg, ArgType), ArgType)); } - EmitCall(CGM.getTypes().getFunctionInfo(ResultType, CallArgs), - Callee, CallArgs, MD); + RValue RV = EmitCall(CGM.getTypes().getFunctionInfo(ResultType, CallArgs), + Callee, CallArgs, MD); if (nv_r || v_r) { // FIXME: Add return value adjustments. } + if (!ResultType->isVoidType()) + EmitReturnOfRValue(RV, ResultType); + FinishFunction(); return Fn; } |