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

[Anders Carlsson]

Author: andersca
Date: Thu Mar 11 23:02:01 2010
New Revision: 98331

URL: http://llvm.org/viewvc/llvm-project?rev=98331&view=rev
Log:
Remove OldOffset.

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=98331&r1=98330&r2=98331&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGVtable.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGVtable.cpp Thu Mar 11 23:02:01 2010
@@ -63,10 +63,7 @@
     /// Offset - the base offset of the overrider in the layout class.
     uint64_t Offset;
     
-    /// OldOffset - FIXME: Remove this.
-    int64_t OldOffset;
-    
-    OverriderInfo() : Method(0), Offset(0), OldOffset(0) { }
+    OverriderInfo() : Method(0), Offset(0) { }
   };
 
 private:
@@ -251,7 +248,6 @@
     OverriderInfo& Overrider = OverridersMap[std::make_pair(Base, MD)];
     assert(!Overrider.Method && "Overrider should not exist yet!");
 
-    Overrider.OldOffset = Base.getBaseOffset();
     Overrider.Offset = OffsetInLayoutClass;
     Overrider.Method = MD;
   }
@@ -415,7 +411,6 @@
 
       // Set the new overrider.
       Overrider.Offset = OverriderOffsetInLayoutClass;
-      Overrider.OldOffset = NewBase.getBaseOffset();
       Overrider.Method = NewMD;
       
       // And propagate it further.
@@ -559,7 +554,7 @@
 
     Out << "  " << MD->getQualifiedNameAsString() << " - (";
     Out << Overrider.Method->getQualifiedNameAsString();
-    Out << ", " << Overrider.OldOffset / 8 << ", " << Overrider.Offset / 8 << ')';
+    Out << ", " << ", " << Overrider.Offset / 8 << ')';
 
     AdjustmentOffsetsMapTy::const_iterator AI =
       ReturnAdjustments.find(std::make_pair(Base, MD));