diff options
author | Anders Carlsson <andersca@mac.com> | 2010-02-13 21:16:54 +0000 |
---|---|---|
committer | Anders Carlsson <andersca@mac.com> | 2010-02-13 21:16:54 +0000 |
commit | 1d05be51b09ae1ce65b1ecd6220bade12908586d (patch) | |
tree | 2a4e0444a4a5338810a98d84382e243678a5de22 /lib/CodeGen/CGVtable.cpp | |
parent | 60db0ee2c1d91ea86b04b5e448810ba418058180 (diff) |
Don't make return adjustments for pure virtual member functions.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@96120 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGVtable.cpp')
-rw-r--r-- | lib/CodeGen/CGVtable.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/CodeGen/CGVtable.cpp b/lib/CodeGen/CGVtable.cpp index 912f33c5d6..f16f66af2a 100644 --- a/lib/CodeGen/CGVtable.cpp +++ b/lib/CodeGen/CGVtable.cpp @@ -426,11 +426,14 @@ void FinalOverriders::PropagateOverrider(const CXXMethodDecl *OldMD, assert(Overrider.Method && "Did not find existing overrider!"); // Get the return adjustment base offset. - BaseOffset ReturnBaseOffset = - ComputeReturnTypeBaseOffset(Context, NewMD, OverriddenMD); - if (!ReturnBaseOffset.isEmpty()) { - // Store the return adjustment base offset. - ReturnAdjustments[SubobjectAndMethod] = ReturnBaseOffset; + // (We don't want to do this for pure virtual member functions). + if (!NewMD->isPure()) { + BaseOffset ReturnBaseOffset = + ComputeReturnTypeBaseOffset(Context, NewMD, OverriddenMD); + if (!ReturnBaseOffset.isEmpty()) { + // Store the return adjustment base offset. + ReturnAdjustments[SubobjectAndMethod] = ReturnBaseOffset; + } } // Set the new overrider. |