mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile: drop -DSUPPRESS_ANNOTATED_LEAKS

Browse Source 
The -DSUPPRESS_ANNOTATED_LEAKS preprocessor directive was used to enable
our `UNLEAK()` macro in the past, which marks memory as still-reachable
so that the leak sanitizer does not complain. Starting with 52c7dbd036
(git-compat-util: drop now-unused `UNLEAK()` macro, 2024-11-20) this
macro has been removed, and thus the preprocessor directive is not
required anymore, either.

Drop it.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-12-13 11:41:17 +01:00
committed by Junio C Hamano
parent 714c134dd6
commit 23eeee08d6
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -1490,7 +1490,6 @@ ifneq ($(filter undefined,$(SANITIZERS)),)
BASIC_CFLAGS += -DSHA1DC_FORCE_ALIGNED_ACCESS BASIC_CFLAGS += -DSHA1DC_FORCE_ALIGNED_ACCESS
endif endif
ifneq ($(filter leak,$(SANITIZERS)),) ifneq ($(filter leak,$(SANITIZERS)),)
BASIC_CFLAGS += -DSUPPRESS_ANNOTATED_LEAKS
BASIC_CFLAGS += -O0 BASIC_CFLAGS += -O0
SANITIZE_LEAK = YesCompiledWithIt SANITIZE_LEAK = YesCompiledWithIt
endif endif

1
meson.build
View File

@ -712,7 +712,6 @@ else
build_options_config.set('SANITIZE_ADDRESS', '') build_options_config.set('SANITIZE_ADDRESS', '')
endif endif
if get_option('b_sanitize').contains('leak') if get_option('b_sanitize').contains('leak')
libgit_c_args += '-DSUPPRESS_ANNOTATED_LEAKS'
build_options_config.set('SANITIZE_LEAK', 'YesCompiledWithIt') build_options_config.set('SANITIZE_LEAK', 'YesCompiledWithIt')
else else
build_options_config.set('SANITIZE_LEAK', '') build_options_config.set('SANITIZE_LEAK', '')