diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2009-12-07 04:45:50 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2009-12-07 04:45:50 +0000 |
| commit | 85301e264436a3b8172ab275fc603044bfd551aa (patch) | |
| tree | a9483fc6f2798e465696bab68b7dfba13e80e965 /lib/CodeGen/CGVtable.cpp | |
| parent | a10c22b796a5fa0bdc2b1565e375dac40dc1405a (diff) | |
Erm, revert for the moment; I didn't test this as thoroughly as I should have
(although it does pass regression tests).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90747 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGVtable.cpp')
| -rw-r--r-- | lib/CodeGen/CGVtable.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/CodeGen/CGVtable.cpp b/lib/CodeGen/CGVtable.cpp index 43c0fe7de1..d227a5e47e 100644 --- a/lib/CodeGen/CGVtable.cpp +++ b/lib/CodeGen/CGVtable.cpp @@ -376,9 +376,8 @@ public: D1(printf(" vfn for %s at %d\n", MD->getNameAsString().c_str(), (int)Index[GD])); - - VCallOffset[GD] = Offset/8; if (MorallyVirtual) { + VCallOffset[GD] = Offset/8; Index_t &idx = VCall[GD]; // Allocate the first one, after that, we reuse the previous one. if (idx == 0) { @@ -845,7 +844,8 @@ bool VtableBuilder::OverrideMethod(GlobalDecl GD, bool MorallyVirtual, return true; } - int64_t NonVirtualAdjustment = -VCallOffset[OGD] + OverrideOffset/8; + // FIXME: finish off + int64_t NonVirtualAdjustment = VCallOffset[OGD] - OverrideOffset/8; if (NonVirtualAdjustment) { ThunkAdjustment ThisAdjustment(NonVirtualAdjustment, 0); |