diff options
| -rw-r--r-- | meson.build | 5 | ||||
| -rw-r--r-- | meson/suppressions/meson.build | 75 | ||||
| -rw-r--r-- | meson/warnings/meson.build | 245 | ||||
| -rw-r--r-- | meson_options.txt | 3 | ||||
| -rw-r--r-- | src/suil_internal.h | 7 |
5 files changed, 49 insertions, 286 deletions
diff --git a/meson.build b/meson.build index 35bf462..555527c 100644 --- a/meson.build +++ b/meson.build @@ -34,9 +34,6 @@ if host_machine.system() == 'darwin' endif # Set global warning flags -if get_option('strict') and not meson.is_subproject() - subdir('meson/warnings') -endif subdir('meson/suppressions') ########################## @@ -307,7 +304,7 @@ endif # Tests # ######### -if get_option('strict') +if get_option('warning_level') == 'everything' # Check release metadata if not meson.is_subproject() autoship = find_program('autoship', required: false) diff --git a/meson/suppressions/meson.build b/meson/suppressions/meson.build index a34ee86..97b8fc7 100644 --- a/meson/suppressions/meson.build +++ b/meson/suppressions/meson.build @@ -1,11 +1,9 @@ -# Copyright 2020-2022 David Robillard <d@drobilla.net> +# Copyright 2020-2023 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR ISC -# Project-specific warning suppressions. -# -# This should be used in conjunction with the generic "warnings" sibling that -# enables all reasonable warnings for the compiler. It lives here just to keep -# the top-level meson.build more readable. +# Project-specific warning suppressions + +warning_level = get_option('warning_level') ##### # C # @@ -14,8 +12,8 @@ if is_variable('cc') c_suppressions = [] - if get_option('strict') - if cc.get_id() == 'clang' + if cc.get_id() in ['clang', 'emscripten'] + if warning_level == 'everything' c_suppressions += [ '-Wno-atomic-implicit-seq-cst', '-Wno-cast-qual', @@ -25,32 +23,46 @@ if is_variable('cc') '-Wno-reserved-id-macro', '-Wno-variadic-macros', ] + endif - if host_machine.system() == 'windows' - c_suppressions += [ - '-Wno-deprecated-declarations', - '-Wno-nonportable-system-include-path', - ] - endif + if host_machine.system() == 'windows' + c_suppressions += [ + '-Wno-deprecated-declarations', + '-Wno-nonportable-system-include-path', + ] + endif - elif cc.get_id() == 'gcc' + elif cc.get_id() == 'gcc' + if warning_level == 'everything' c_suppressions += [ '-Wno-padded', '-Wno-suggest-attribute=const', '-Wno-suggest-attribute=pure', ] + endif - elif cc.get_id() == 'msvc' + elif cc.get_id() == 'msvc' + c_suppressions += [ + '/experimental:external', + '/external:W0', + '/external:anglebrackets', + ] + + if warning_level == 'everything' c_suppressions += [ '/wd4191', # unsafe function conversion '/wd4514', # unreferenced inline function has been removed '/wd4710', # function not inlined '/wd4820', # padding added after construct - '/wd4996', # function or variable may be unsafe '/wd5045', # will insert Spectre mitigation for memory load ] endif + if warning_level in ['everything', '3', '2'] + c_suppressions += [ + '/wd4996', # function or variable may be unsafe + ] + endif endif c_suppressions = cc.get_supported_arguments(c_suppressions) @@ -63,10 +75,12 @@ endif if is_variable('cpp') cpp_suppressions = [] - if get_option('strict') - if cpp.get_id() == 'clang' + if cpp.get_id() in ['clang', 'emscripten'] + if warning_level == 'everything' cpp_suppressions += [ '-Wno-atomic-implicit-seq-cst', + '-Wno-c++98-compat', + '-Wno-c++98-compat-pedantic', '-Wno-cast-qual', '-Wno-disabled-macro-expansion', '-Wno-old-style-cast', @@ -75,8 +89,9 @@ if is_variable('cpp') '-Wno-variadic-macros', '-Wno-zero-as-null-pointer-constant', ] - - elif cpp.get_id() == 'gcc' + endif + elif cpp.get_id() == 'gcc' + if warning_level == 'everything' cpp_suppressions += [ '-Wno-arith-conversion', '-Wno-cast-qual', @@ -99,14 +114,18 @@ endif if is_variable('objcpp') objcpp_suppressions = [] - if objcpp.get_id() == 'clang' - c_suppressions += [ - '-Wno-deprecated-declarations', - ] + if objcpp.get_id() in ['clang', 'emscripten'] + if warning_level == 'everything' + c_suppressions += [ + '-Wno-deprecated-declarations', + ] + endif elif objcpp.get_id() == 'gcc' - objcpp_suppressions = gcc_common_warnings + [ - '-Wno-direct-ivar-access', - ] + if warning_level == 'everything' + objcpp_suppressions = gcc_common_warnings + [ + '-Wno-direct-ivar-access', + ] + endif endif objcpp_suppressions = objcpp.get_supported_arguments(objcpp_suppressions) diff --git a/meson/warnings/meson.build b/meson/warnings/meson.build deleted file mode 100644 index 858dc7b..0000000 --- a/meson/warnings/meson.build +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 2020-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: 0BSD OR ISC - -# General code to enable approximately all warnings in GCC 12, clang, and MSVC. -# -# This is trivial for clang and MSVC, but GCC doesn't have an "everything" -# option, so we need to enable everything we want explicitly. Wall is assumed, -# but Wextra is not, for stability. -# -# These are collected from common.opt and c.opt in the GCC source, and manually -# curated with the help of the GCC documentation. Warnings that are -# application-specific, historical, or about compatibility between specific -# language revisions are omitted. The intent here is to have roughly the same -# meaning as clang's Weverything: extremely strict, but general. Specifically -# omitted are: -# -# General: -# -# Wabi= -# Waggregate-return -# Walloc-size-larger-than=BYTES -# Walloca-larger-than=BYTES -# Wframe-larger-than=BYTES -# Wlarger-than=BYTES -# Wstack-usage=BYTES -# Wsystem-headers -# Wtraditional -# Wtraditional-conversion -# Wtrampolines -# Wvla-larger-than=BYTES -# -# Build specific: -# -# Wpoison-system-directories -# -# C Specific: -# -# Wc11-c2x-compat -# Wc90-c99-compat -# Wc99-c11-compat -# Wdeclaration-after-statement -# Wtraditional -# Wtraditional-conversion -# -# C++ Specific: -# -# Wc++0x-compat -# Wc++1z-compat -# Wc++2a-compat -# Wctad-maybe-unsupported -# Wnamespaces -# Wtemplates - -gcc_common_warnings = [ - '-Walloc-zero', - '-Walloca', - '-Wanalyzer-too-complex', - '-Warith-conversion', - '-Warray-bounds=2', - '-Wattribute-alias=2', - '-Wbidi-chars=ucn', - '-Wcast-align=strict', - '-Wcast-function-type', - '-Wcast-qual', - '-Wclobbered', - '-Wconversion', - '-Wdate-time', - '-Wdisabled-optimization', - '-Wdouble-promotion', - '-Wduplicated-branches', - '-Wduplicated-cond', - '-Wempty-body', - '-Wendif-labels', - '-Wfloat-equal', - '-Wformat-overflow=2', - '-Wformat-signedness', - '-Wformat-truncation=2', - '-Wformat=2', - '-Wignored-qualifiers', - '-Wimplicit-fallthrough=3', - '-Winit-self', - '-Winline', - '-Winvalid-pch', - '-Wlogical-op', - '-Wmissing-declarations', - '-Wmissing-field-initializers', - '-Wmissing-include-dirs', - '-Wmultichar', - '-Wnormalized=nfc', - '-Wnull-dereference', - '-Wopenacc-parallelism', - '-Woverlength-strings', - '-Wpacked', - '-Wpacked-bitfield-compat', - '-Wpadded', - '-Wpointer-arith', - '-Wredundant-decls', - '-Wshadow', - '-Wshift-negative-value', - '-Wshift-overflow=2', - '-Wstack-protector', - '-Wstrict-aliasing=3', - '-Wstrict-overflow=5', - '-Wstring-compare', - '-Wstringop-overflow=3', - '-Wsuggest-attribute=cold', - '-Wsuggest-attribute=const', - '-Wsuggest-attribute=format', - '-Wsuggest-attribute=malloc', - '-Wsuggest-attribute=noreturn', - '-Wsuggest-attribute=pure', - '-Wswitch-default', - '-Wswitch-enum', - '-Wtrampolines', - '-Wtrivial-auto-var-init', - '-Wtype-limits', - '-Wundef', - '-Wuninitialized', - '-Wunsafe-loop-optimizations', - '-Wunused', - '-Wunused-const-variable=2', - '-Wunused-macros', - '-Wvector-operation-performance', - '-Wvla', - '-Wwrite-strings', -] - -##### -# C # -##### - -if is_variable('cc') - all_c_warnings = [] - - if cc.get_id() == 'clang' - all_c_warnings += ['-Weverything'] - - elif cc.get_id() == 'gcc' - all_c_warnings += gcc_common_warnings + [ - '-Wabsolute-value', - '-Wbad-function-cast', - '-Wc++-compat', - '-Wenum-conversion', - '-Wjump-misses-init', - '-Wmissing-parameter-type', - '-Wmissing-prototypes', - '-Wnested-externs', - '-Wold-style-declaration', - '-Wold-style-definition', - '-Woverride-init', - '-Wsign-compare', - '-Wstrict-prototypes', - '-Wunsuffixed-float-constants', - ] - - elif cc.get_id() == 'msvc' - all_c_warnings += ['/Wall'] - endif - - all_c_warnings = cc.get_supported_arguments(all_c_warnings) - add_global_arguments(all_c_warnings, language: ['c']) -endif - -####### -# C++ # -####### - -if is_variable('cpp') - all_cpp_warnings = [] - - if cpp.get_id() == 'clang' - all_cpp_warnings += [ - '-Weverything', - '-Wno-c++98-compat', - '-Wno-c++98-compat-pedantic' - ] - - elif cpp.get_id() == 'gcc' - all_cpp_warnings += gcc_common_warnings + [ - '-Wabi-tag', - '-Waligned-new=all', - '-Wcatch-value=3', - '-Wcomma-subscript', - '-Wconditionally-supported', - '-Wctor-dtor-privacy', - '-Wdelete-non-virtual-dtor', - '-Wdeprecated', - '-Wdeprecated-copy', - '-Wdeprecated-copy-dtor', - '-Wdeprecated-enum-enum-conversion', - '-Wdeprecated-enum-float-conversion', - '-Weffc++', - '-Wexpansion-to-defined', - '-Wextra-semi', - '-Wimport', - '-Winvalid-imported-macros', - '-Wmismatched-tags', - '-Wmultiple-inheritance', - '-Wnoexcept', - '-Wnoexcept-type', - '-Wnon-virtual-dtor', - '-Wold-style-cast', - '-Woverloaded-virtual', - '-Wplacement-new=2', - '-Wredundant-move', - '-Wredundant-tags', - '-Wregister', - '-Wsign-compare', - '-Wsign-promo', - '-Wsized-deallocation', - '-Wstrict-null-sentinel', - '-Wsuggest-final-methods', - '-Wsuggest-final-types', - '-Wsuggest-override', - '-Wuseless-cast', - '-Wvirtual-inheritance', - '-Wvolatile', - '-Wzero-as-null-pointer-constant', - ] - - elif cpp.get_id() == 'msvc' - all_cpp_warnings += ['/Wall'] - endif - - all_cpp_warnings = cpp.get_supported_arguments(all_cpp_warnings) - add_global_arguments(all_cpp_warnings, language: ['cpp']) -endif - -################# -# Objective C++ # -################# - -if is_variable('objcpp') - all_objcpp_warnings = [] - - if objcpp.get_id() == 'clang' - all_objcpp_warnings += ['-Weverything'] - - elif objpp.get_id() == 'gcc' - all_objcpp_warnings = gcc_common_warnings - endif - - all_objcpp_warnings = objcpp.get_supported_arguments(all_objcpp_warnings) - add_global_arguments(all_objcpp_warnings, language: ['objcpp']) -endif diff --git a/meson_options.txt b/meson_options.txt index 620747b..c5719f3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -16,9 +16,6 @@ option('gtk3', type: 'feature', value: 'auto', yield: true, option('qt5', type: 'feature', value: 'auto', yield: true, description : 'Build Qt5 wrappers') -option('strict', type: 'boolean', value: false, yield: true, - description: 'Enable ultra-strict warnings') - option('tests', type: 'feature', value: 'auto', yield: true, description: 'Build tests') diff --git a/src/suil_internal.h b/src/suil_internal.h index b6640c3..753bfb1 100644 --- a/src/suil_internal.h +++ b/src/suil_internal.h @@ -1,4 +1,4 @@ -// Copyright 2007-2022 David Robillard <d@drobilla.net> +// Copyright 2007-2023 David Robillard <d@drobilla.net> // SPDX-License-Identifier: ISC #ifndef SUIL_INTERNAL_H @@ -21,11 +21,6 @@ #ifdef __cplusplus extern "C" { -# if defined(__GNUC__) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wold-style-cast" -# pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" -# endif #endif #define SUIL_ERRORF(fmt, ...) fprintf(stderr, "suil error: " fmt, __VA_ARGS__) |