commit 3aaf486af649d6be464e6b937c8181529ffef931
author Anders Carlsson <andersca@mac.com> Fri Dec 04 05:51:56 2009 +0000
committer Anders Carlsson <andersca@mac.com> Fri Dec 04 05:51:56 2009 +0000
tree 599f81a22c35b9e769c32c05514b3df359d8715c
parent 84206757573bb9f3c91a48cebf800e3fb6c48301

Make sure that overridden method decls are always canonical.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90542 91177308-0d34-0410-b5e6-96231b3b80d8

lib/AST/DeclCXX.cpp

diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp
index 979723a..5064ec5 100644
--- a/lib/AST/DeclCXX.cpp
+++ b/lib/AST/DeclCXX.cpp
@@ -589,6 +589,8 @@
 static OverriddenMethodsMapTy *OverriddenMethods = 0;
 
 void CXXMethodDecl::addOverriddenMethod(const CXXMethodDecl *MD) {
+  assert(MD->isCanonicalDecl() && "Method is not canonical!");
+  
   // FIXME: The CXXMethodDecl dtor needs to remove and free the entry.
 
   if (!OverriddenMethods)

lib/CodeGen/CGVtable.cpp

diff --git a/lib/CodeGen/CGVtable.cpp b/lib/CodeGen/CGVtable.cpp
index 5e44827..869bcc0 100644
--- a/lib/CodeGen/CGVtable.cpp
+++ b/lib/CodeGen/CGVtable.cpp
@@ -742,7 +742,7 @@
        mi != e; ++mi) {
     GlobalDecl OGD;
     
-    const CXXMethodDecl *OMD = (*mi)->getCanonicalDecl();
+    const CXXMethodDecl *OMD = *mi;
     if (const CXXDestructorDecl *DD = dyn_cast<CXXDestructorDecl>(OMD))
       OGD = GlobalDecl(DD, GD.getDtorType());
     else
@@ -933,7 +933,7 @@
     // Check if this method overrides a method in the primary base.
     for (CXXMethodDecl::method_iterator i = MD->begin_overridden_methods(),
          e = MD->end_overridden_methods(); i != e; ++i) {
-      const CXXMethodDecl *OverriddenMD = (*i)->getCanonicalDecl();
+      const CXXMethodDecl *OverriddenMD = *i;
       const CXXRecordDecl *OverriddenRD = OverriddenMD->getParent();
       assert(OverriddenMD->isCanonicalDecl() &&
              "Should have the canonical decl of the overridden RD!");

lib/Sema/SemaDecl.cpp

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 3e29b72..effab5a 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -2585,7 +2585,7 @@
         if (!CheckOverridingFunctionReturnType(MD, OldMD) &&
             !CheckOverridingFunctionExceptionSpec(MD, OldMD) &&
             !CheckOverridingFunctionAttributes(MD, OldMD))
-          MD->addOverriddenMethod(OldMD);
+          MD->addOverriddenMethod(OldMD->getCanonicalDecl());
       }
     }
   }