Revert "[msan][libcxx] Enable -fsanitize-memory-param-retval"
This reverts commit beff64ee44acec4e7bfbc2ab165acba7579a6bb7.
The original commit was reviewed as D123979.
This commit caused the libc++ pre-commit CI to fail
https://buildkite.com/llvm-project/libcxx-ci/builds/10483
Reviewed By: #libc, Mordante
Differential Revision: https://reviews.llvm.org/D124713
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index 4314bc2..9ad93a3 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -733,7 +733,7 @@
if (USE_SANITIZER STREQUAL "Address")
append_flags(SANITIZER_FLAGS "-fsanitize=address")
elseif (USE_SANITIZER MATCHES "Memory(WithOrigins)?")
- append_flags(SANITIZER_FLAGS -fsanitize=memory -fsanitize-memory-param-retval)
+ append_flags(SANITIZER_FLAGS -fsanitize=memory)
if (USE_SANITIZER STREQUAL "MemoryWithOrigins")
append_flags(SANITIZER_FLAGS "-fsanitize-memory-track-origins")
endif()
diff --git a/libcxx/utils/libcxx/test/params.py b/libcxx/utils/libcxx/test/params.py
index 79b58a0..2c18aba 100644
--- a/libcxx/utils/libcxx/test/params.py
+++ b/libcxx/utils/libcxx/test/params.py
@@ -146,9 +146,9 @@
AddFlag('-fsanitize=address') if sanitizer == 'Address' else None,
AddFeature('asan') if sanitizer == 'Address' else None,
- AddFlag('-fsanitize=memory -fsanitize-memory-param-retval') if sanitizer in ['Memory', 'MemoryWithOrigins'] else None,
- AddFeature('msan') if sanitizer in ['Memory', 'MemoryWithOrigins'] else None,
- AddFlag('-fsanitize-memory-track-origins') if sanitizer == 'MemoryWithOrigins' else None,
+ AddFlag('-fsanitize=memory') if sanitizer in ['Memory', 'MemoryWithOrigins'] else None,
+ AddFeature('msan') if sanitizer in ['Memory', 'MemoryWithOrigins'] else None,
+ AddFlag('-fsanitize-memory-track-origins') if sanitizer == 'MemoryWithOrigins' else None,
AddFlag('-fsanitize=thread') if sanitizer == 'Thread' else None,
AddFeature('tsan') if sanitizer == 'Thread' else None,
