Remove word 'block' from option and diagnostic I added
in r156825.

llvm-svn: 156831
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 7c87aa1..be1ab69 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -9543,7 +9543,7 @@
   
   if (LangOpts.ObjCNonFragileABI2 &&
       !NewID->isInvalidDecl() && isa<ObjCInterfaceDecl>(EnclosingDecl))
-    Diag(Loc, diag::warn_ivar_in_interface_block);
+    Diag(Loc, diag::warn_ivars_in_interface);
   
   return NewID;
 }