[cfe-commits] r64572 - in /cfe/trunk: lib/Sema/SemaExpr.cpp test/Sema/attr-deprecated.c

[Chris Lattner]

Author: lattner
Date: Sat Feb 14 19:38:09 2009
New Revision: 64572

URL: http://llvm.org/viewvc/llvm-project?rev=64572&view=rev
Log:
allow implementations of deprecated functions to use deprecated symbols.

Modified:
    cfe/trunk/lib/Sema/SemaExpr.cpp
    cfe/trunk/test/Sema/attr-deprecated.c

Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=64572&r1=64571&r2=64572&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Sat Feb 14 19:38:09 2009
@@ -752,10 +752,16 @@
                                   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;

Modified: cfe/trunk/test/Sema/attr-deprecated.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/attr-deprecated.c?rev=64572&r1=64571&r2=64572&view=diff

==============================================================================
--- cfe/trunk/test/Sema/attr-deprecated.c (original)
+++ cfe/trunk/test/Sema/attr-deprecated.c Sat Feb 14 19:38:09 2009
@@ -29,6 +29,6 @@
 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.
 }