Merge commit '4d6167ed96d3' from llvm.org/main into next

Author: git apple-llvm automerger

clang/test/CMakeLists.txt

@@ -9,6 +9,7 @@ llvm_canonicalize_cmake_booleans(
   CLANG_PLUGIN_SUPPORT
   CLANG_SPAWN_CC1
   CLANG_ENABLE_CIR
+  CLANG_ENABLE_OBJC_REWRITER
   ENABLE_BACKTRACES
   LLVM_BUILD_EXAMPLES
   LLVM_BYE_LINK_INTO_TOOLS

clang/test/lit.site.cfg.py.in

@@ -22,7 +22,7 @@ config.host_cxx = "@CMAKE_CXX_COMPILER@"
 config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@"
 config.have_zlib = @LLVM_ENABLE_ZLIB@
 config.have_zstd = @LLVM_ENABLE_ZSTD@
-config.clang_objc_rewriter = "@CLANG_ENABLE_OBJC_REWRITER@" == "ON"
+config.clang_objc_rewriter = @CLANG_ENABLE_OBJC_REWRITER@
 config.clang_default_pie_on_linux = @CLANG_DEFAULT_PIE_ON_LINUX@
 config.clang_default_cxx_stdlib = "@CLANG_DEFAULT_CXX_STDLIB@"
 config.clang_staticanalyzer = @CLANG_ENABLE_STATIC_ANALYZER@