From e609636e0ddc85d56dff8265c4fc8ea0cd5ed1ef Mon Sep 17 00:00:00 2001
From: Anders Carlsson <andersca@mac.com>
Date: Fri, 4 Dec 2009 03:41:37 +0000
Subject: [PATCH] Add a way to get the index of a method. Assert that we have
 the same index for now.

llvm-svn: 90533
---
 clang/lib/CodeGen/CGVtable.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/clang/lib/CodeGen/CGVtable.cpp b/clang/lib/CodeGen/CGVtable.cpp
index 23de0a79481e..736af406fc44 100644
--- a/clang/lib/CodeGen/CGVtable.cpp
+++ b/clang/lib/CodeGen/CGVtable.cpp
@@ -90,13 +90,17 @@ private:
       // Replace the old decl with the new decl.
       Methods[Index] = GD;
 
-      // Now remove the old decl from the method to index map.
-      MethodToIndexMap.erase(i);
-        
       // And add the new.
       MethodToIndexMap[GD] = Index;
     }
 
+    /// getIndex - Returns the index of the given method.
+    uint64_t getIndex(GlobalDecl GD) const {
+      assert(MethodToIndexMap.count(GD) && "Did not find method!");
+      
+      return MethodToIndexMap.lookup(GD);
+    }
+
     MethodsVectorTy::size_type size() const {
       return Methods.size();
     }
@@ -106,7 +110,7 @@ private:
       Methods.clear();
     }
     
-    GlobalDecl operator[](unsigned Index) const {
+    GlobalDecl operator[](uint64_t Index) const {
       return Methods[Index];
     }
   };
@@ -751,9 +755,10 @@ bool VtableBuilder::OverrideMethod(GlobalDecl GD, llvm::Constant *m,
 
     for (Index_t i = 0, e = submethods.size();
          i != e; ++i) {
-      // FIXME: begin_overridden_methods might be too lax, covariance */
       if (submethods[i] != om)
         continue;
+
+      assert(i == Methods.getIndex(OGD));
       
       QualType ReturnType = 
         MD->getType()->getAs<FunctionType>()->getResultType();