From c6a039d087ca2b333d1d3a2604d675e0010f7063 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sun, 20 Jan 2019 22:40:31 +0100 Subject: build: Fix -Wconversion warnings for fpclassify et al closes #8274 - Instead of #undef and re-#define, define "xfoo" wrappers to avoid include-order sensitivity. - The warnings are bogus, caused by bad interaction between glibc and clang 6+. - https://bugs.llvm.org/show_bug.cgi?id=35268 - https://bugs.llvm.org/show_bug.cgi?id=39738 - https://bugzilla.redhat.com/show_bug.cgi?id=1472437 --- src/nvim/eval/encode.c | 9 ++------- src/nvim/macros.h | 21 +++++++++++++++++++++ src/nvim/strings.c | 15 +++------------ 3 files changed, 26 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/nvim/eval/encode.c b/src/nvim/eval/encode.c index 64658b52d9..cf9ecd8d56 100644 --- a/src/nvim/eval/encode.c +++ b/src/nvim/eval/encode.c @@ -28,11 +28,6 @@ #include "nvim/lib/kvec.h" #include "nvim/eval/typval_encode.h" -#ifdef __MINGW32__ -# undef fpclassify -# define fpclassify __fpclassify -#endif - #define ga_concat(a, b) ga_concat(a, (char_u *)b) #define utf_ptr2char(b) utf_ptr2char((char_u *)b) #define utf_ptr2len(b) ((size_t)utf_ptr2len((char_u *)b)) @@ -327,7 +322,7 @@ int encode_read_from_list(ListReaderState *const state, char *const buf, #define TYPVAL_ENCODE_CONV_FLOAT(tv, flt) \ do { \ const float_T flt_ = (flt); \ - switch (fpclassify(flt_)) { \ + switch (xfpclassify(flt_)) { \ case FP_NAN: { \ ga_concat(gap, (char_u *) "str2float('nan')"); \ break; \ @@ -531,7 +526,7 @@ int encode_read_from_list(ListReaderState *const state, char *const buf, #define TYPVAL_ENCODE_CONV_FLOAT(tv, flt) \ do { \ const float_T flt_ = (flt); \ - switch (fpclassify(flt_)) { \ + switch (xfpclassify(flt_)) { \ case FP_NAN: { \ EMSG(_("E474: Unable to represent NaN value in JSON")); \ return FAIL; \ diff --git a/src/nvim/macros.h b/src/nvim/macros.h index d447bff765..1d47520d8a 100644 --- a/src/nvim/macros.h +++ b/src/nvim/macros.h @@ -1,6 +1,10 @@ #ifndef NVIM_MACROS_H #define NVIM_MACROS_H +#include + +#include "auto/config.h" + // EXTERN is only defined in main.c. That's where global variables are // actually defined and initialized. #ifndef EXTERN @@ -19,6 +23,23 @@ # define MAX(X, Y) ((X) > (Y) ? (X) : (Y)) #endif +#if defined(__clang__) && __clang__ == 1 && __clang_major__ >= 6 \ + && defined(HAVE___FPCLASSIFY) +// Workaround glibc + Clang 6+ bug. #8274 +// https://bugzilla.redhat.com/show_bug.cgi?id=1472437 +# define xfpclassify __fpclassify +# define xisnan __isnan +# define xisinf __isinf +#elif defined(__MINGW32__) +// Workaround mingw warning. #7863 +# define xfpclassify __fpclassify +# define xisnan _isnan +#else +# define xfpclassify fpclassify +# define xisnan isnan +# define xisinf isinf +#endif + /// String with length /// /// For use in functions which accept (char *s, size_t len) pair in arguments. diff --git a/src/nvim/strings.c b/src/nvim/strings.c index 4921824316..533784767c 100644 --- a/src/nvim/strings.c +++ b/src/nvim/strings.c @@ -50,16 +50,7 @@ #include "nvim/os/shell.h" #include "nvim/eval/encode.h" -#ifdef __MINGW32__ -# undef fpclassify -# define fpclassify __fpclassify -# undef isnan -# define isnan _isnan -#endif - -/* - * Copy "string" into newly allocated memory. - */ +/// Copy "string" into newly allocated memory. char_u *vim_strsave(const char_u *string) FUNC_ATTR_NONNULL_RET FUNC_ATTR_MALLOC FUNC_ATTR_NONNULL_ALL { @@ -1214,14 +1205,14 @@ int vim_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap, remove_trailing_zeroes = true; } - if (isinf(f) + if (xisinf(f) || (strchr("fF", fmt_spec) != NULL && abs_f > 1.0e307)) { xstrlcpy(tmp, infinity_str(f > 0.0, fmt_spec, force_sign, space_for_positive), sizeof(tmp)); str_arg_l = strlen(tmp); zero_padding = 0; - } else if (isnan(f)) { + } else if (xisnan(f)) { // Not a number: nan or NAN memmove(tmp, ASCII_ISUPPER(fmt_spec) ? "NAN" : "nan", 4); str_arg_l = 3; -- cgit From 226352afcbbc5af703f168c1290e07add26b44fe Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 21 Jan 2019 00:19:15 +0100 Subject: build: Fix -Wconversion warnings for fpclassify et al closes #8274 The parent commit tries a different approach, but that fails on Apple Clang version: Apple LLVM version 10.0.0 (clang-1000.11.45.5) Target: x86_64-apple-darwin17.7.0 which somehow compiles the check_c_source_compiles() check, but then complains during later compilation that __fpclassify is not defined (regardless of "#include "). --- src/nvim/eval/encode.c | 1 + src/nvim/macros.h | 21 --------------------- src/nvim/math.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/nvim/math.h | 7 +++++++ src/nvim/strings.c | 1 + 5 files changed, 51 insertions(+), 21 deletions(-) create mode 100644 src/nvim/math.c create mode 100644 src/nvim/math.h (limited to 'src') diff --git a/src/nvim/eval/encode.c b/src/nvim/eval/encode.c index cf9ecd8d56..6074e4ee69 100644 --- a/src/nvim/eval/encode.c +++ b/src/nvim/eval/encode.c @@ -19,6 +19,7 @@ #include "nvim/eval/typval.h" #include "nvim/garray.h" #include "nvim/mbyte.h" +#include "nvim/math.h" #include "nvim/message.h" #include "nvim/memory.h" #include "nvim/charset.h" // vim_isprintc() diff --git a/src/nvim/macros.h b/src/nvim/macros.h index 1d47520d8a..d447bff765 100644 --- a/src/nvim/macros.h +++ b/src/nvim/macros.h @@ -1,10 +1,6 @@ #ifndef NVIM_MACROS_H #define NVIM_MACROS_H -#include - -#include "auto/config.h" - // EXTERN is only defined in main.c. That's where global variables are // actually defined and initialized. #ifndef EXTERN @@ -23,23 +19,6 @@ # define MAX(X, Y) ((X) > (Y) ? (X) : (Y)) #endif -#if defined(__clang__) && __clang__ == 1 && __clang_major__ >= 6 \ - && defined(HAVE___FPCLASSIFY) -// Workaround glibc + Clang 6+ bug. #8274 -// https://bugzilla.redhat.com/show_bug.cgi?id=1472437 -# define xfpclassify __fpclassify -# define xisnan __isnan -# define xisinf __isinf -#elif defined(__MINGW32__) -// Workaround mingw warning. #7863 -# define xfpclassify __fpclassify -# define xisnan _isnan -#else -# define xfpclassify fpclassify -# define xisnan isnan -# define xisinf isinf -#endif - /// String with length /// /// For use in functions which accept (char *s, size_t len) pair in arguments. diff --git a/src/nvim/math.c b/src/nvim/math.c new file mode 100644 index 0000000000..b51f335ed7 --- /dev/null +++ b/src/nvim/math.c @@ -0,0 +1,42 @@ +// This is an open source non-commercial project. Dear PVS-Studio, please check +// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com + +#include + +#include "nvim/math.h" + +#ifdef INCLUDE_GENERATED_DECLARATIONS +# include "math.c.generated.h" +#endif + +#if defined(__clang__) && __clang__ == 1 && __clang_major__ >= 6 +// Workaround glibc + Clang 6+ bug. #8274 +// https://bugzilla.redhat.com/show_bug.cgi?id=1472437 +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wconversion" +#endif +int xfpclassify(double d) +{ +#if defined(__MINGW32__) + // Workaround mingw warning. #7863 + return __fpclassify(d); +#else + return fpclassify(d); +#endif +} +int xisinf(double d) +{ + return isinf(d); +} +int xisnan(double d) +{ +#if defined(__MINGW32__) + // Workaround mingw warning. #7863 + return _isnan(d); +#else + return isnan(d); +#endif +} +#if defined(__clang__) && __clang__ == 1 && __clang_major__ >= 6 +# pragma clang diagnostic pop +#endif diff --git a/src/nvim/math.h b/src/nvim/math.h new file mode 100644 index 0000000000..7969323905 --- /dev/null +++ b/src/nvim/math.h @@ -0,0 +1,7 @@ +#ifndef NVIM_MATH_H +#define NVIM_MATH_H + +#ifdef INCLUDE_GENERATED_DECLARATIONS +# include "math.h.generated.h" +#endif +#endif // NVIM_MATH_H diff --git a/src/nvim/strings.c b/src/nvim/strings.c index 533784767c..96a8dfd295 100644 --- a/src/nvim/strings.c +++ b/src/nvim/strings.c @@ -27,6 +27,7 @@ #include "nvim/func_attr.h" #include "nvim/getchar.h" #include "nvim/mark.h" +#include "nvim/math.h" #include "nvim/mbyte.h" #include "nvim/memfile.h" #include "nvim/memline.h" -- cgit