diff options
| author | Aaron Ballman <aaron@aaronballman.com> | 2019-02-12 13:13:35 +0000 |
|---|---|---|
| committer | Aaron Ballman <aaron@aaronballman.com> | 2019-02-12 13:13:35 +0000 |
| commit | 682f052308c455959cafe99d53dd7b7fc95fcc67 (patch) | |
| tree | 83f5f3a05bb0fa2ca19a059a07c875978a28afa6 | |
| parent | e0dc1a910866c987598a323e2c64bae9166a3ba7 (diff) | |
| download | clang-682f052308c455959cafe99d53dd7b7fc95fcc67.tar.gz | |
Renaming this diagnostic to not conflict with another; NFC.
Amends r353837 which renamed the diagnostics to conflict.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@353838 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.td | 2 | ||||
| -rw-r--r-- | lib/Sema/SemaDeclAttr.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 359131c860..9f6763671f 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -3023,7 +3023,7 @@ def warn_thread_attribute_decl_not_lockable : Warning< def warn_thread_attribute_decl_not_pointer : Warning< "%0 only applies to pointer types; type here is %1">, InGroup<ThreadSafetyAttributes>, DefaultIgnore; -def err_attribute_argument_out_of_range : Error< +def err_attribute_argument_out_of_bounds : Error< "%0 attribute parameter %1 is out of bounds: " "%plural{0:no parameters to index into|" "1:can only be 1, since there is one parameter|" diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp index c17263167c..b607c2ce85 100644 --- a/lib/Sema/SemaDeclAttr.cpp +++ b/lib/Sema/SemaDeclAttr.cpp @@ -716,7 +716,7 @@ static void checkAttrArgsAreCapabilityObjs(Sema &S, Decl *D, uint64_t ParamIdxFromOne = ArgValue.getZExtValue(); uint64_t ParamIdxFromZero = ParamIdxFromOne - 1; if (!ArgValue.isStrictlyPositive() || ParamIdxFromOne > NumParams) { - S.Diag(AL.getLoc(), diag::err_attribute_argument_out_of_range) + S.Diag(AL.getLoc(), diag::err_attribute_argument_out_of_bounds) << AL << Idx + 1 << NumParams; continue; } |