commit cc4ca0a32476fa6090d212210168f7b7bc34dd23
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Tue Oct 09 01:23:45 2012 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Tue Oct 09 01:23:45 2012 +0000
tree 1b7c8beddcbb456058260a8fe2e1e9a2cf085caf
parent bb860bd2644a072b98423f7661c1e1ac10a7540c

When storing the C++ overridden methods, store them once for the
canonical method; avoid storing them again for an out-of-line definition.

llvm-svn: 165472

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 0979228..aec5f01 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -6038,7 +6038,8 @@
     // Find any virtual functions that this function overrides.
     if (CXXMethodDecl *Method = dyn_cast<CXXMethodDecl>(NewFD)) {
       if (!Method->isFunctionTemplateSpecialization() && 
-          !Method->getDescribedFunctionTemplate()) {
+          !Method->getDescribedFunctionTemplate() &&
+          Method->isCanonicalDecl()) {
         if (AddOverriddenMethods(Method->getParent(), Method)) {
           // If the function was marked as "static", we have a problem.
           if (NewFD->getStorageClass() == SC_Static) {