Skip to content

Commit beff64e

Browse files
committed
[msan][libcxx] Enable -fsanitize-memory-param-retval
We are considering to make -fsanitize-memory-param-retval enabled by default so probably this patch is unnneded. Reviewed By: #libc, EricWF Differential Revision: https://reviews.llvm.org/D123979
1 parent 2d13386 commit beff64e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

libcxx/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ function(get_sanitizer_flags OUT_VAR USE_SANITIZER)
733733
if (USE_SANITIZER STREQUAL "Address")
734734
append_flags(SANITIZER_FLAGS "-fsanitize=address")
735735
elseif (USE_SANITIZER MATCHES "Memory(WithOrigins)?")
736-
append_flags(SANITIZER_FLAGS -fsanitize=memory)
736+
append_flags(SANITIZER_FLAGS -fsanitize=memory -fsanitize-memory-param-retval)
737737
if (USE_SANITIZER STREQUAL "MemoryWithOrigins")
738738
append_flags(SANITIZER_FLAGS "-fsanitize-memory-track-origins")
739739
endif()

libcxx/utils/libcxx/test/params.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@ def getStdFlag(cfg, std):
146146
AddFlag('-fsanitize=address') if sanitizer == 'Address' else None,
147147
AddFeature('asan') if sanitizer == 'Address' else None,
148148

149-
AddFlag('-fsanitize=memory') if sanitizer in ['Memory', 'MemoryWithOrigins'] else None,
150-
AddFeature('msan') if sanitizer in ['Memory', 'MemoryWithOrigins'] else None,
151-
AddFlag('-fsanitize-memory-track-origins') if sanitizer == 'MemoryWithOrigins' else None,
149+
AddFlag('-fsanitize=memory -fsanitize-memory-param-retval') if sanitizer in ['Memory', 'MemoryWithOrigins'] else None,
150+
AddFeature('msan') if sanitizer in ['Memory', 'MemoryWithOrigins'] else None,
151+
AddFlag('-fsanitize-memory-track-origins') if sanitizer == 'MemoryWithOrigins' else None,
152152

153153
AddFlag('-fsanitize=thread') if sanitizer == 'Thread' else None,
154154
AddFeature('tsan') if sanitizer == 'Thread' else None,

0 commit comments

Comments
 (0)