diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-09-05 23:22:51 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-09-05 23:22:51 +0000 |
| commit | 8b91396055eeffbeb35b131f1f94d8568904d728 (patch) | |
| tree | 2277de9768e29e5b26c183b9a3ad1aa086f28d0c /gcc/builtin-attrs.def | |
| parent | 5ea3a30191fdf08cfb1aed64ad35598f6e16c9a2 (diff) | |
| download | gcc-8b91396055eeffbeb35b131f1f94d8568904d728.tar.gz | |
* builtin-attrs.def (ATTR_NONNULL_3): New.
(DEF_FORMAT_ATTRIBUTE): Use just ATTR_NONNULL_##FA instead of
ATTR_NOTHROW_NONNULL_##FA.
(DEF_FORMAT_ATTRIBUTE_NOTHROW, DEF_FORMAT_ATTRIBUTE_BOTH): New macros.
(ATTR_FORMAT_PRINTF_NOTHROW_2_0, ATTR_PRINTF_NOTHROW_2_3,
ATTR_FORMAT_PRINTF_NOTHROW_3_0, ATTR_FORMAT_PRINTF_NOTHROW_3_4,
ATTR_FORMAT_PRINTF_NOTHROW_4_0, ATTR_PRINTF_NOTHROW_4_5,
ATTR_FORMAT_PRINTF_NOTHROW_5_0, ATTR_FORMAT_PRINTF_NOTHROW_5_6,
ATTR_FORMAT_SCANF_NOTHROW_2_0, ATTR_FORMAT_SCANF_NOTHROW_2_3,
ATTR_FORMAT_STRFTIME_NOTHROW_3_0, ATTR_FORMAT_STRFMON_NOTHROW_3_4):
New.
(ATTR_FORMAT_PRINTF_4_0, ATTR_PRINTF_4_5, ATTR_FORMAT_PRINTF_5_0,
ATTR_FORMAT_PRINTF_5_6, ATTR_FORMAT_STRFTIME_3_0,
ATTR_FORMAT_NOTHROW_3_4): Remove.
* builtins.def (snprintf, sprintf, sscanf, vsnprintf, vsprintf,
vsscanf, strfmon, strftime, __snprintf_chk, __sprintf_chk,
__vsnprintf_chk, __vsprintf_chk): Use ATTR_FORMAT_*_NOTHROW_*
instead of ATTR_FORMAT_*_*.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@128158 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/builtin-attrs.def')
| -rw-r--r-- | gcc/builtin-attrs.def | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/gcc/builtin-attrs.def b/gcc/builtin-attrs.def index 5b2e3afc709..81700cc77bd 100644 --- a/gcc/builtin-attrs.def +++ b/gcc/builtin-attrs.def @@ -118,6 +118,8 @@ DEF_ATTR_TREE_LIST (ATTR_NONNULL_LIST, ATTR_NONNULL, ATTR_NULL, ATTR_NULL) DEF_ATTR_TREE_LIST (ATTR_NONNULL_1, ATTR_NONNULL, ATTR_LIST_1, ATTR_NULL) /* Functions whose second parameter is a nonnull pointer. */ DEF_ATTR_TREE_LIST (ATTR_NONNULL_2, ATTR_NONNULL, ATTR_LIST_2, ATTR_NULL) +/* Functions whose third parameter is a nonnull pointer. */ +DEF_ATTR_TREE_LIST (ATTR_NONNULL_3, ATTR_NONNULL, ATTR_LIST_3, ATTR_NULL) /* Nothrow functions with the sentinel(1) attribute. */ DEF_ATTR_TREE_LIST (ATTR_NOTHROW_SENTINEL_1, ATTR_SENTINEL, ATTR_LIST_1, \ ATTR_NOTHROW_LIST) @@ -157,24 +159,38 @@ DEF_ATTR_TREE_LIST (ATTR_MALLOC_NOTHROW_NONNULL, ATTR_MALLOC, ATTR_NULL, \ DEF_ATTR_TREE_LIST (ATTR_##TYPE##_##VALUES, ATTR_NULL, \ ATTR_##TYPE, ATTR_LIST_##VALUES) \ DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_##VALUES, ATTR_FORMAT, \ + ATTR_##TYPE##_##VALUES, ATTR_NONNULL_##FA) +#define DEF_FORMAT_ATTRIBUTE_NOTHROW(TYPE, FA, VALUES) \ + DEF_ATTR_TREE_LIST (ATTR_##TYPE##_##VALUES, ATTR_NULL, \ + ATTR_##TYPE, ATTR_LIST_##VALUES) \ + DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_NOTHROW_##VALUES, ATTR_FORMAT,\ + ATTR_##TYPE##_##VALUES, ATTR_NOTHROW_NONNULL_##FA) +#define DEF_FORMAT_ATTRIBUTE_BOTH(TYPE, FA, VALUES) \ + DEF_ATTR_TREE_LIST (ATTR_##TYPE##_##VALUES, ATTR_NULL, \ + ATTR_##TYPE, ATTR_LIST_##VALUES) \ + DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_##VALUES, ATTR_FORMAT, \ + ATTR_##TYPE##_##VALUES, ATTR_NONNULL_##FA) \ + DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_NOTHROW_##VALUES, ATTR_FORMAT,\ ATTR_##TYPE##_##VALUES, ATTR_NOTHROW_NONNULL_##FA) DEF_FORMAT_ATTRIBUTE(PRINTF,1,1_0) DEF_FORMAT_ATTRIBUTE(PRINTF,1,1_2) -DEF_FORMAT_ATTRIBUTE(PRINTF,2,2_0) -DEF_FORMAT_ATTRIBUTE(PRINTF,2,2_3) -DEF_FORMAT_ATTRIBUTE(PRINTF,3,3_0) -DEF_FORMAT_ATTRIBUTE(PRINTF,3,3_4) -DEF_FORMAT_ATTRIBUTE(PRINTF,4,4_0) -DEF_FORMAT_ATTRIBUTE(PRINTF,4,4_5) -DEF_FORMAT_ATTRIBUTE(PRINTF,5,5_0) -DEF_FORMAT_ATTRIBUTE(PRINTF,5,5_6) +DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,2,2_0) +DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,2,2_3) +DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,3,3_0) +DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,3,3_4) +DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,4,4_0) +DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,4,4_5) +DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,5,5_0) +DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,5,5_6) DEF_FORMAT_ATTRIBUTE(SCANF,1,1_0) DEF_FORMAT_ATTRIBUTE(SCANF,1,1_2) -DEF_FORMAT_ATTRIBUTE(SCANF,2,2_0) -DEF_FORMAT_ATTRIBUTE(SCANF,2,2_3) -DEF_FORMAT_ATTRIBUTE(STRFTIME,3,3_0) -DEF_FORMAT_ATTRIBUTE(STRFMON,3,3_4) +DEF_FORMAT_ATTRIBUTE_BOTH(SCANF,2,2_0) +DEF_FORMAT_ATTRIBUTE_BOTH(SCANF,2,2_3) +DEF_FORMAT_ATTRIBUTE_NOTHROW(STRFTIME,3,3_0) +DEF_FORMAT_ATTRIBUTE_NOTHROW(STRFMON,3,3_4) #undef DEF_FORMAT_ATTRIBUTE +#undef DEF_FORMAT_ATTRIBUTE_NOTHROW +#undef DEF_FORMAT_ATTRIBUTE_BOTH /* Construct a tree for a format_arg attribute. */ #define DEF_FORMAT_ARG_ATTRIBUTE(FA) \ |