diff options
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 14 | ||||
| -rw-r--r-- | test/Sema/attr-deprecated.c | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index ef4ae54b86..43ed22a48b 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -752,10 +752,16 @@ Sema::ActOnDeclarationNameExpr(Scope *S, SourceLocation Loc, false, false, SS)); ValueDecl *VD = cast<ValueDecl>(D); - // check if referencing an identifier with __attribute__((deprecated)). - if (VD->getAttr<DeprecatedAttr>()) - ExprError(Diag(Loc, diag::warn_deprecated) << VD->getDeclName()); - + // Check if referencing an identifier with __attribute__((deprecated)). + if (VD->getAttr<DeprecatedAttr>()) { + // If this reference happens *in* a deprecated function or method, don't + // warn. Implementing deprecated stuff requires referencing depreated + // stuff. + NamedDecl *ND = getCurFunctionOrMethodDecl(); + if (ND == 0 || !ND->getAttr<DeprecatedAttr>()) + Diag(Loc, diag::warn_deprecated) << VD->getDeclName(); + } + if (VarDecl *Var = dyn_cast<VarDecl>(VD)) { if (Var->isDeclaredInCondition() && Var->getType()->isScalarType()) { Scope *CheckS = S; diff --git a/test/Sema/attr-deprecated.c b/test/Sema/attr-deprecated.c index dfe01dc710..ada06f01e5 100644 --- a/test/Sema/attr-deprecated.c +++ b/test/Sema/attr-deprecated.c @@ -29,6 +29,6 @@ int old_fn(); int (*fn_ptr)() = old_fn; // expected-warning {{'old_fn' is deprecated}} int old_fn() { - return old_fn()+1; // expected-warning {{'old_fn' is deprecated}} + return old_fn()+1; // no warning, deprecated functions can use deprecated symbols. } |