Partially revert "gn build: Merge r353471, r353373."

[mbonadei]

Summary

gn build: Merge r353590

[thakis]

Sorry, I didn't see this soon enough. I landed the same thing in https://reviews.llvm.org/rL353621 already.

[mbonadei]

No worries. :)

llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn

values = [
     "CLANG_OPENMP_NVPTX_DEFAULT_ARCH=sm_35",
     "CLANG_LIBDIR_SUFFIX=",
     "CLANG_RESOURCE_DIR=",
     "C_INCLUDE_DIRS=",
     "CLANG_CONFIG_FILE_SYSTEM_DIR=",
     "CLANG_CONFIG_FILE_USER_DIR=",
     "DEFAULT_SYSROOT=",
     "GCC_INSTALL_PREFIX=",
+    "CLANG_ANALYZER_WITH_Z3=",
     "BACKEND_PACKAGE_STRING=LLVM ${llvm_version}svn",
     "ENABLE_LINKER_BUILD_ID=",
     "ENABLE_X86_RELAX_RELOCATIONS=",
     "ENABLE_EXPERIMENTAL_NEW_PASS_MANAGER=",
     "CLANG_ENABLE_OBJC_REWRITER=1",  # FIXME: flag?
   ]
 
   if (clang_enable_arcmt) {

llvm/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn

sources = [
     "LoopWidening.cpp",
     "MemRegion.cpp",
     "PathDiagnostic.cpp",
     "PlistDiagnostics.cpp",
     "ProgramState.cpp",
     "RangeConstraintManager.cpp",
     "RangedConstraintManager.cpp",
     "RegionStore.cpp",
-    "SMTConstraintManager.cpp",
     "SValBuilder.cpp",
     "SVals.cpp",
     "SarifDiagnostics.cpp",
     "SimpleConstraintManager.cpp",
     "SimpleSValBuilder.cpp",
     "Store.cpp",
     "SubEngine.cpp",
     "SymbolManager.cpp",
     "TaintManager.cpp",
     "WorkList.cpp",
+    "Z3ConstraintManager.cpp",
   ]
+
+  # FIXME: clang/Config/BUILD.gn currently always sets CLANG_ANALYZER_WITH_Z3
+  # to false. If that changes we need to link to Z3 libs here.
 }

llvm/utils/gn/secondary/clang/test/BUILD.gn

 }
 
 write_lit_config("lit_site_cfg") {
   # Fully-qualified instead of relative for LIT_SITE_CFG_IN_HEADER.
   input = "//clang/test/lit.site.cfg.py.in"
   output = clang_lit_site_cfg_file
 
   extra_values = [
-    "LLVM_WITH_Z3=",  # Must be empty, not 0.
+    "CLANG_ANALYZER_WITH_Z3=",  # Must be empty, not 0.
     "CLANG_BUILD_EXAMPLES=0",
     "CLANG_DEFAULT_CXX_STDLIB=",  # Empty string means "default value" here.
     "CLANG_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
 
     # This is only used if LLVM_USE_SANITIZER includes lsan and the host
     # OS is macOS. Since the GN build currently never uses LLVM_USE_SANITIZER,
     # this is never read.  If it's ever needed,
     # utils/gn/build/toolchain/BUILD.gn should get the compiler from a variable

llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn

values = [
     "PACKAGE_BUGREPORT=https://bugs.llvm.org/",
     "PACKAGE_NAME=LLVM",
     "PACKAGE_STRING=LLVM ${llvm_version}svn",
     "PACKAGE_VERSION=${llvm_version}svn",
     "PACKAGE_VENDOR=",
     "RETSIGTYPE=void",
     "LLVM_GISEL_COV_ENABLED=",
     "LLVM_GISEL_COV_PREFIX=",
-    "LLVM_WITH_Z3=",
 
     # This is both in llvm-config.h and config.h; llvm-config.h doesn't
     # define it if it's not set while config.h defines it to empty in that case.
     "LLVM_DEFAULT_TARGET_TRIPLE=$llvm_target_triple",
   ]
 
   if (current_os == "linux" || current_os == "android") {
     values += [

llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn

sources = [
     "RWMutex.cpp",
     "Signals.cpp",
     "TargetRegistry.cpp",
     "ThreadLocal.cpp",
     "Threading.cpp",
     "Valgrind.cpp",
     "VirtualFileSystem.cpp",
     "Watchdog.cpp",
-    "Z3Solver.cpp",
   ]
 
   libs = []
 
-  # FIXME: llvm/Config/BUILD.gn currently always sets LLVM_WITH_Z3
-  # to false. If that changes we need to link to Z3 libs here.
-
   if (current_os == "linux" || current_os == "android") {
     libs += [ "dl" ]
   }
 }