diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index b585bd544b12..491579c8139d 100644
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -1376,10 +1376,7 @@ static void ProcessDeclAttribute(Decl *D, const AttributeList &Attr, Sema &S) {
     // Just ignore
     break;
   default:
-#if 0
-    // TODO: when we have the full set of attributes, warn about unknown ones.
     S.Diag(Attr.getLoc(), diag::warn_attribute_ignored) << Attr.getName();
-#endif
     break;
   }
 }
diff --git a/clang/test/Sema/attr-deprecated.c b/clang/test/Sema/attr-deprecated.c
index f018c3356fc4..c1a3ae30664c 100644
--- a/clang/test/Sema/attr-deprecated.c
+++ b/clang/test/Sema/attr-deprecated.c
@@ -4,7 +4,7 @@ int f() __attribute__((deprecated));
 void g() __attribute__((deprecated));
 void g();
 
-void z() __attribute__((bogusattr)); // todo-warning {{'bogusattr' attribute ignored}}
+void z() __attribute__((bogusattr)); // expected-warning {{'bogusattr' attribute ignored}}
 
 extern int var __attribute__((deprecated));