[cfe-commits] r98247 - /cfe/trunk/lib/CodeGen/CGVtable.cpp

[Anders Carlsson]

Author: andersca
Date: Thu Mar 11 01:00:45 2010
New Revision: 98247

URL: http://llvm.org/viewvc/llvm-project?rev=98247&view=rev
Log:
When possible, use the vbase offset offsets from the most derived class directly.

Modified:
    cfe/trunk/lib/CodeGen/CGVtable.cpp

Modified: cfe/trunk/lib/CodeGen/CGVtable.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGVtable.cpp?rev=98247&r1=98246&r2=98247&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGVtable.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGVtable.cpp Thu Mar 11 01:00:45 2010
@@ -1406,9 +1406,16 @@
   if (!Offset.isEmpty()) {
     if (Offset.VirtualBase) {
       // Get the virtual base offset offset.
-      Adjustment.VBaseOffsetOffset = 
-        VtableInfo.getVirtualBaseOffsetIndex(Offset.DerivedClass,
-                                             Offset.VirtualBase);
+      if (Offset.DerivedClass == MostDerivedClass) {
+        // We can get the offset offset directly from our map.
+        Adjustment.VBaseOffsetOffset = 
+          VBaseOffsetOffsets.lookup(Offset.VirtualBase);
+      } else {
+        Adjustment.VBaseOffsetOffset = 
+          VtableInfo.getVirtualBaseOffsetIndex(Offset.DerivedClass,
+                                               Offset.VirtualBase);
+      }
+
       // FIXME: Once the assert in getVirtualBaseOffsetIndex is back again,
       // we can get rid of this assert.
       assert(Adjustment.VBaseOffsetOffset != 0 &&