diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2009-12-04 08:52:11 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2009-12-04 08:52:11 +0000 |
| commit | 65d87222b2af0e556f872fecc1b4a82e23e22fb4 (patch) | |
| tree | 4909da55bf809bbfc7a457ad9c522a027cb59223 | |
| parent | 1602277b70ff1b7d1177f2c4da6c64e718f72608 (diff) | |
| download | bcm5719-llvm-65d87222b2af0e556f872fecc1b4a82e23e22fb4.tar.gz bcm5719-llvm-65d87222b2af0e556f872fecc1b4a82e23e22fb4.zip | |
Minor cleanup; no functionality change.
llvm-svn: 90565
| -rw-r--r-- | clang/lib/CodeGen/CGVtable.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/clang/lib/CodeGen/CGVtable.cpp b/clang/lib/CodeGen/CGVtable.cpp index 6a03aeab5d7..96e5fc58377 100644 --- a/clang/lib/CodeGen/CGVtable.cpp +++ b/clang/lib/CodeGen/CGVtable.cpp @@ -506,17 +506,11 @@ public: const bool PrimaryBaseWasVirtual = Layout.getPrimaryBaseWasVirtual(); // vtables are composed from the chain of primaries. - if (PrimaryBase) { + if (PrimaryBase && !PrimaryBaseWasVirtual) { D1(printf(" doing primaries for %s most derived %s\n", RD->getNameAsCString(), Class->getNameAsCString())); - - int BaseCurrentVBaseOffset = CurrentVBaseOffset; - if (PrimaryBaseWasVirtual) - BaseCurrentVBaseOffset = BLayout.getVBaseClassOffset(PrimaryBase); - - if (!PrimaryBaseWasVirtual) - Primaries(PrimaryBase, PrimaryBaseWasVirtual|MorallyVirtual, Offset, - updateVBIndex, current_vbindex, BaseCurrentVBaseOffset); + Primaries(PrimaryBase, PrimaryBaseWasVirtual|MorallyVirtual, Offset, + updateVBIndex, current_vbindex, CurrentVBaseOffset); } D1(printf(" doing vcall entries for %s most derived %s\n", |
