| Message ID | 20181023113416.90958-1-carenas@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | khash: silence -Wunused-function | expand |
On Tue, Oct 23, 2018 at 1:42 PM Carlo Marcelo Arenas Belón <carenas@gmail.com> wrote: > > after 36da893114 ("config.mak.dev: enable -Wunused-function", 2018-10-18) > macro generated code should use a similar solution than commit-slab to > silence the compiler. > > Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> > --- > khash.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/khash.h b/khash.h > index d10caa0c35..39c2833877 100644 > --- a/khash.h > +++ b/khash.h > @@ -234,7 +234,7 @@ static const double __ac_HASH_UPPER = 0.77; > __KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) > > #define KHASH_INIT(name, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \ > - KHASH_INIT2(name, static inline, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) > + KHASH_INIT2(name, __attribute__((__unused__)) static inline, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) Maybe move MAYBE_UNUSED from commit-slab-impl.h to git-compat-util.h and use it here so we have an easier time if we have to use a different way to mark unused functions on some exotic platform. > > /* Other convenient macros... */ > > -- > 2.19.1 >
Am 23.10.2018 um 13:34 schrieb Carlo Marcelo Arenas Belón: > after 36da893114 ("config.mak.dev: enable -Wunused-function", 2018-10-18) > macro generated code should use a similar solution than commit-slab to > silence the compiler. With Clang 6 and GCC 8 on Debian I don't get any warnings on master or 36da893114. With Clang 6 on OpenBSD I get warnings about the unused khash functions in delta-islands.c on master, though. What do you get, or in other words: why did you send this patch? > Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> > --- > khash.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/khash.h b/khash.h > index d10caa0c35..39c2833877 100644 > --- a/khash.h > +++ b/khash.h > @@ -234,7 +234,7 @@ static const double __ac_HASH_UPPER = 0.77; > __KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) > > #define KHASH_INIT(name, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \ > - KHASH_INIT2(name, static inline, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) > + KHASH_INIT2(name, __attribute__((__unused__)) static inline, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) > > /* Other convenient macros... */ > This fixes the warning on OpenBSD for me. So does moving the KHASH_INIT line from delta-islands.c to a header file (e.g. khash.h or delta-islands.h). René
On Tue, Oct 23, 2018 at 9:19 AM René Scharfe <l.s.r@web.de> wrote: > With Clang 6 and GCC 8 on Debian I don't get any warnings on master or > 36da893114. I see it with Clang 7 on Fedora (at least Rawhide but suspect also to affect the next release, now in beta: 29) > With Clang 6 on OpenBSD I get warnings about the unused khash functions > in delta-islands.c on master, though. Apple LLVM 9 and 10 will also trigger similar warnings to what you see in OpenBSD and as Junio mentioned recently in a different thread about semantic patches, this currently affects the CI for "Apple": https://travis-ci.org/git/git/builds/444969342 Carlo
diff --git a/khash.h b/khash.h index d10caa0c35..39c2833877 100644 --- a/khash.h +++ b/khash.h @@ -234,7 +234,7 @@ static const double __ac_HASH_UPPER = 0.77; __KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) #define KHASH_INIT(name, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \ - KHASH_INIT2(name, static inline, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) + KHASH_INIT2(name, __attribute__((__unused__)) static inline, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) /* Other convenient macros... */
after 36da893114 ("config.mak.dev: enable -Wunused-function", 2018-10-18) macro generated code should use a similar solution than commit-slab to silence the compiler. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> --- khash.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)