Loop directly over sanitizers to build in cmake

[fjricci]

Summary

Cleaner than computing the intersection for each possible sanitizer

[compnerd]

Thanks for cleaning this up.

compiler-rt/trunk/lib/CMakeLists.txt

 if(COMPILER_RT_BUILD_BUILTINS)
   add_subdirectory(builtins)
 endif()
 
 function(compiler_rt_build_runtime runtime)
   string(TOUPPER ${runtime} runtime_uppercase)
   if(COMPILER_RT_HAS_${runtime_uppercase})
     add_subdirectory(${runtime})
-    foreach(directory ${ARGN})
-      add_subdirectory(${directory})
-    endforeach()
-  endif()
-endfunction()
-
-function(compiler_rt_build_sanitizer sanitizer)
-  string(TOLOWER ${sanitizer} sanitizer_lowercase)
-  list(FIND COMPILER_RT_SANITIZERS_TO_BUILD ${sanitizer_lowercase} result)
-  if(NOT ${result} EQUAL -1)
-    compiler_rt_build_runtime(${sanitizer} ${ARGN})
   endif()
 endfunction()
 
 if(COMPILER_RT_BUILD_SANITIZERS)
   compiler_rt_build_runtime(interception)
 
   if(COMPILER_RT_HAS_SANITIZER_COMMON)
     add_subdirectory(stats)
     add_subdirectory(lsan)
     add_subdirectory(ubsan)
   endif()
 
-  compiler_rt_build_sanitizer(asan)
-  compiler_rt_build_sanitizer(dfsan)
-  compiler_rt_build_sanitizer(msan)
-  compiler_rt_build_sanitizer(tsan tsan/dd)
-  compiler_rt_build_sanitizer(safestack)
-  compiler_rt_build_sanitizer(cfi)
-  compiler_rt_build_sanitizer(esan)
-  compiler_rt_build_sanitizer(scudo)
+  foreach(sanitizer ${COMPILER_RT_SANITIZERS_TO_BUILD})
+    compiler_rt_build_runtime(${sanitizer})
+    if(${sanitizer} STREQUAL tsan)
+      add_subdirectory(tsan/dd)
+    endif()
+  endforeach()
 
   compiler_rt_build_runtime(profile)
 endif()
 
 if(COMPILER_RT_BUILD_XRAY)
   compiler_rt_build_runtime(xray)
 endif()

compiler-rt/trunk/test/CMakeLists.txt

function(compiler_rt_test_runtime runtime)
   if(COMPILER_RT_HAS_${runtime_uppercase})
     add_subdirectory(${runtime})
     foreach(directory ${ARGN})
       add_subdirectory(${directory})
     endforeach()
   endif()
 endfunction()
 
-function(compiler_rt_test_sanitizer sanitizer)
-  string(TOLOWER ${sanitizer} sanitizer_lowercase)
-  list(FIND COMPILER_RT_SANITIZERS_TO_BUILD ${sanitizer_lowercase} result)
-  if(NOT ${result} EQUAL -1)
-    compiler_rt_test_runtime(${sanitizer} ${ARGN})
-  endif()
-endfunction()
-
 # Run sanitizer tests only if we're sure that clang would produce
 # working binaries.
 if(COMPILER_RT_CAN_EXECUTE_TESTS)
   if(COMPILER_RT_BUILD_BUILTINS)
     add_subdirectory(builtins)
   endif()
   if(COMPILER_RT_BUILD_SANITIZERS)
     compiler_rt_test_runtime(interception)
 
     compiler_rt_test_runtime(lsan)
     # CFI tests require diagnostic mode, which is implemented in UBSan.
     compiler_rt_test_runtime(ubsan cfi)
     compiler_rt_test_runtime(sanitizer_common)
 
-    compiler_rt_test_sanitizer(asan)
-    compiler_rt_test_sanitizer(dfsan)
-    compiler_rt_test_sanitizer(msan)
-    compiler_rt_test_sanitizer(tsan)
-    compiler_rt_test_sanitizer(safestack)
-    compiler_rt_test_sanitizer(esan)
-    compiler_rt_test_sanitizer(scudo)
+    foreach(sanitizer ${COMPILER_RT_SANITIZERS_TO_BUILD})
+      compiler_rt_test_runtime(${sanitizer})
+    endforeach()
 
     compiler_rt_test_runtime(profile)
   endif()
   if(COMPILER_RT_BUILD_XRAY)
     compiler_rt_test_runtime(xray)
   endif()
 endif()