diff options
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 11 | ||||
| -rw-r--r-- | test/SemaCXX/attr-deprecated.cpp | 13 |
2 files changed, 23 insertions, 1 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index a4a612306a..4df55e6762 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -1002,7 +1002,16 @@ Sema::BuildDeclarationNameExpr(SourceLocation Loc, NamedDecl *D, MarkDeclarationReferenced(Loc, D); if (PerformObjectMemberConversion(This, D)) return ExprError(); - if (DiagnoseUseOfDecl(D, Loc)) + + bool ShouldCheckUse = true; + if (CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(D)) { + // Don't diagnose the use of a virtual member function unless it's + // explicitly qualified. + if (MD->isVirtual() && (!SS || !SS->isSet())) + ShouldCheckUse = false; + } + + if (ShouldCheckUse && DiagnoseUseOfDecl(D, Loc)) return ExprError(); return Owned(BuildMemberExpr(Context, This, true, SS, D, Loc, MemberType)); diff --git a/test/SemaCXX/attr-deprecated.cpp b/test/SemaCXX/attr-deprecated.cpp index 10b4a55198..c1bdfcca97 100644 --- a/test/SemaCXX/attr-deprecated.cpp +++ b/test/SemaCXX/attr-deprecated.cpp @@ -27,12 +27,25 @@ void A::h(A* a) struct B { virtual void f() __attribute__((deprecated)); + void g(); }; +void B::g() { + f(); + B::f(); // expected-warning{{'f' is deprecated}} +} + struct C : B { virtual void f(); + void g(); }; +void C::g() { + f(); + C::f(); + B::f(); // expected-warning{{'f' is deprecated}} +} + void f(B* b, C *c) { b->f(); b->B::f(); // expected-warning{{'f' is deprecated}} |