[PATCH] D114033: [llvm][ubsan] Inclusive language: replace use of blacklist HandleLLVMOptions.cmake but use old option name

[Zarko Todorovski via Phabricator via llvm-commits]

ZarkoCA created this revision.
ZarkoCA added reviewers: fhahn, vitalybuka, bjope, lebedev.ri, quinnp.
Herald added a subscriber: mgorny.
ZarkoCA requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Retry at https://reviews.llvm.org/D113689, this time with using the old option name
to support older versions of clang.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D114033

Files:
  llvm/cmake/modules/HandleLLVMOptions.cmake
  llvm/utils/sanitizers/ubsan_blacklist.txt
  llvm/utils/sanitizers/ubsan_ignorelist.txt


Index: llvm/cmake/modules/HandleLLVMOptions.cmake
===================================================================
--- llvm/cmake/modules/HandleLLVMOptions.cmake
+++ llvm/cmake/modules/HandleLLVMOptions.cmake
@@ -870,9 +870,11 @@
     append("-fsanitize=fuzzer-no-link" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
   endif()
   if (LLVM_USE_SANITIZER MATCHES ".*Undefined.*")
-    set(BLACKLIST_FILE "${CMAKE_SOURCE_DIR}/utils/sanitizers/ubsan_blacklist.txt")
-    if (EXISTS "${BLACKLIST_FILE}")
-      append("-fsanitize-blacklist=${BLACKLIST_FILE}"
+    set(IGNORELIST_FILE "${CMAKE_SOURCE_DIR}/utils/sanitizers/ubsan_ignorelist.txt")
+    if (EXISTS "${IGNORELIST_FILE}")
+      # Use this option name version since -fsanitize-ignorelist is only
+      # accepted with clang 13.0 or newer.
+      append("-fsanitize-blacklist=${IGNORELIST_FILE}"
              CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
     endif()
   endif()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D114033.387758.patch
Type: text/x-patch
Size: 909 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20211116/c24ac4bc/attachment.bin>