From: Nico Weber <nicolasweber@gmx.de>
Date: Tue, 26 Mar 2019 18:55:37 +0000 (+0000)
Subject: gn build: Merge r356929 (effectively relands r353518, reverted in r353621)
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10ee5d422df488ea2385d8acf33ff8414f12d4f2;p=llvm

gn build: Merge r356929 (effectively relands r353518, reverted in r353621)

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@357019 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/utils/gn/secondary/clang/include/clang/Config/BUILD.gn b/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
index 6a3194a3ae2..61b8887bd6d 100644
--- a/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
+++ b/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
@@ -30,7 +30,6 @@ write_cmake_config("Config") {
     "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=",
diff --git a/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn b/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn
index 745bc236935..a9dd15c9401 100644
--- a/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn
+++ b/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn
@@ -48,6 +48,7 @@ static_library("Core") {
     "RangeConstraintManager.cpp",
     "RangedConstraintManager.cpp",
     "RegionStore.cpp",
+    "SMTConstraintManager.cpp",
     "SValBuilder.cpp",
     "SVals.cpp",
     "SarifDiagnostics.cpp",
@@ -58,9 +59,5 @@ static_library("Core") {
     "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.
 }
diff --git a/utils/gn/secondary/clang/test/BUILD.gn b/utils/gn/secondary/clang/test/BUILD.gn
index 514d09024ea..b5c5ec058b9 100644
--- a/utils/gn/secondary/clang/test/BUILD.gn
+++ b/utils/gn/secondary/clang/test/BUILD.gn
@@ -39,7 +39,7 @@ write_lit_config("lit_site_cfg") {
   output = clang_lit_site_cfg_file
 
   extra_values = [
-    "CLANG_ANALYZER_WITH_Z3=",  # Must be empty, not 0.
+    "LLVM_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"),
diff --git a/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
index ea408dae2d0..3b78c39075d 100644
--- a/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
+++ b/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
@@ -124,6 +124,7 @@ write_cmake_config("config") {
     "RETSIGTYPE=void",
     "LLVM_GISEL_COV_ENABLED=",
     "LLVM_GISEL_COV_PREFIX=",
+    "LLVM_WITH_Z3=",
 
     # FIXME: Set to 1 on mac once the 10.14 SDK is in common use.
     "LLVM_SUPPORT_XCODE_SIGNPOSTS=",
diff --git a/utils/gn/secondary/llvm/lib/Support/BUILD.gn b/utils/gn/secondary/llvm/lib/Support/BUILD.gn
index 0e5e89b08e2..c8654275470 100644
--- a/utils/gn/secondary/llvm/lib/Support/BUILD.gn
+++ b/utils/gn/secondary/llvm/lib/Support/BUILD.gn
@@ -125,6 +125,7 @@ static_library("Support") {
     "WithColor.cpp",
     "YAMLParser.cpp",
     "YAMLTraits.cpp",
+    "Z3Solver.cpp",
     "circular_raw_ostream.cpp",
     "raw_os_ostream.cpp",
     "raw_ostream.cpp",
@@ -157,6 +158,9 @@ static_library("Support") {
 
   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" ]
   } else if (current_os == "win") {