diff options
author | Anders Carlsson <andersca@mac.com> | 2009-10-18 19:34:08 +0000 |
---|---|---|
committer | Anders Carlsson <andersca@mac.com> | 2009-10-18 19:34:08 +0000 |
commit | 70017943020f755e25d8ca0cb338ea59a6398a21 (patch) | |
tree | 66d462ae56c424484ae0d357c394c37307ef33b4 | |
parent | beb873d84a6ff379bbb8bc1e7eb2c59abb7bd7e0 (diff) | |
download | bcm5719-llvm-70017943020f755e25d8ca0cb338ea59a6398a21.tar.gz bcm5719-llvm-70017943020f755e25d8ca0cb338ea59a6398a21.zip |
It's OK for a pure virtual function to override another pure virtual function. Fixes PR5222.
llvm-svn: 84428
-rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 6 | ||||
-rw-r--r-- | clang/test/SemaCXX/abstract.cpp | 15 |
2 files changed, 17 insertions, 4 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 419c8a13c2d..d2ef113b305 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -1658,12 +1658,10 @@ namespace { // Traverse the record, looking for methods. if (CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(*i)) { // If the method is pure virtual, add it to the methods vector. - if (MD->isPure()) { + if (MD->isPure()) Methods.push_back(MD); - continue; - } - // Otherwise, record all the overridden methods in our set. + // Record all the overridden methods in our set. for (CXXMethodDecl::method_iterator I = MD->begin_overridden_methods(), E = MD->end_overridden_methods(); I != E; ++I) { // Keep track of the overridden methods. diff --git a/clang/test/SemaCXX/abstract.cpp b/clang/test/SemaCXX/abstract.cpp index e14304a26fe..42b8d7febe6 100644 --- a/clang/test/SemaCXX/abstract.cpp +++ b/clang/test/SemaCXX/abstract.cpp @@ -123,3 +123,18 @@ struct K { struct L : public K { void f(); }; + +// PR5222 +namespace PR5222 { + struct A { + virtual A *clone() = 0; + }; + struct B : public A { + virtual B *clone() = 0; + }; + struct C : public B { + virtual C *clone(); + }; + + C c; +} |