Refine diagnostic: attribute 'nonnull' applies to both functions and methods.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@199460 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/Attr.td b/include/clang/Basic/Attr.td
index 95526d7781b66a5e0b64c58d1621ba39266f6db2..6426bc1ab2fa10fbe50409636f2f5ae8f0c2a703 100644 (file)
--- a/include/clang/Basic/Attr.td
+++ b/include/clang/Basic/Attr.td
@@ -680,7 +680,7 @@ def NoMips16 : InheritableAttr, TargetSpecificAttr<TargetMips> {
 def NonNull : InheritableAttr {
   let Spellings = [GNU<"nonnull">, CXX11<"gnu", "nonnull">];
   let Subjects = SubjectList<[ObjCMethod, FunctionLike, HasFunctionProto],
-                             WarnDiag, "ExpectedFunction">;
+                             WarnDiag, "ExpectedFunctionOrMethod">;
   let Args = [VariadicUnsignedArgument<"Args">];
   let AdditionalMembers =
 [{bool isNonNull(unsigned idx) const {