Merge pull request #497 from kleintom/virtual_overrides

Get the clang plugin to recognize pure virtuals for overrides/overriddens. Fixes bug 1226893.
mozilla · Dec 16, 2015 · 4085323 · 4085323
2 parents d8b8caa + b7d0ff7
commit 4085323
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/dxr/plugins/clang/dxr-index.cpp b/dxr/plugins/clang/dxr-index.cpp
@@ -490,11 +490,19 @@ class IndexConsumer : public ASTConsumer,
         // What do we override?
         CXXMethodDecl::method_iterator iter = methodDecl->begin_overridden_methods();
         if (iter) {
-          const FunctionDecl *overriddenDef;
-          if ((*iter)->isDefined(overriddenDef)) {
-            recordValue("overriddenname", overriddenDef->getNameAsString());
-            recordValue("overriddenqualname", getQualifiedName(*overriddenDef));
-            recordValue("overriddenloc", locationToString(overriddenDef->getLocStart())); // Finds the right line but the wrong columns. We ignore everything but the file path.
+          const FunctionDecl *overriddenDecl = nullptr;
+          // Get the overridden definition if it exists...
+          (*iter)->isDefined(overriddenDecl);
+          // Otherwise get the pure virtual declaration if that exists.
+          if (!overriddenDecl && (*iter)->isPure()) {
+            overriddenDecl = *iter;
+          }
+          if (overriddenDecl) {
+            recordValue("overriddenname", overriddenDecl->getNameAsString());
+            recordValue("overriddenqualname", getQualifiedName(*overriddenDecl));
+            // getLocStart() finds the right line but the wrong columns. We
+            // ignore everything but the file path.
+            recordValue("overriddenloc", locationToString(overriddenDecl->getLocStart()));
           }
         }
       }

diff --git a/dxr/plugins/clang/tests/test_menus/test_menus.py b/dxr/plugins/clang/tests/test_menus/test_menus.py
@@ -187,10 +187,6 @@ def test_override_ref(self):
                 {'html': 'Find overrides',
                  'href': '/code/search?q=%2Boverrides%3ABaseClass%3A%3AvirtualFunc%28%29'})
 
-    # We don't yet recognize pure virtual functions as something that gets
-    # overridden - activate the next two tests when that gets fixed.
-
-    @nose.tools.raises(AssertionError) # remove this line when fixed
     def test_override_pure_overrides(self):
         """Make sure pure virtual functions that have an override are
         recognized."""
@@ -199,7 +195,6 @@ def test_override_pure_overrides(self):
                 {'html': 'Find overrides',
                  'href': '/code/search?q=%2Boverrides%3ABaseClass%3A%3ApVirtualFunc%28%29'})
 
-    @nose.tools.raises(AssertionError) # remove this line when fixed
     def test_override_pure_overridden(self):
         """Make sure overrides of a pure virtual function are recognized."""
         menu_on(self.source_page('extern.c'),