[llvm] 25b7efc - Revert "[gn build] (manually) port 83a798d4b0e1 (abi_breaking_checks in tests)"

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2022-04-06T14:02:09-04:00
New Revision: 25b7efc9d1042347b0cbd22004221c52b0ce2d85

URL: https://github.com/llvm/llvm-project/commit/25b7efc9d1042347b0cbd22004221c52b0ce2d85
DIFF: https://github.com/llvm/llvm-project/commit/25b7efc9d1042347b0cbd22004221c52b0ce2d85.diff

LOG: Revert "[gn build] (manually) port 83a798d4b0e1 (abi_breaking_checks in tests)"

This reverts commit edddf384c22b039df8d3a31bbc86f9eb4945a65d.
83a798d4b0e1 was reverted in 62a983ebc570e8ffa3d.

Added: 
    

Modified: 
    llvm/utils/gn/build/buildflags.gni
    llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
    llvm/utils/gn/secondary/llvm/test/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/build/buildflags.gni b/llvm/utils/gn/build/buildflags.gni
index 3dbff36822ec4..e6d7ca1806a9f 100644
--- a/llvm/utils/gn/build/buildflags.gni
+++ b/llvm/utils/gn/build/buildflags.gni
@@ -29,9 +29,6 @@ declare_args() {
   # Whether to build with optimizations.
   is_optimized = !is_debug
 
-  # Enable additional checks that alter the LLVM C++ ABI.
-  llvm_enable_abi_breaking_checks = llvm_enable_assertions
-
   # Debug info symbol level.
   if (is_debug) {
     symbol_level = 2

diff  --git a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
index 67ce75cc2c6b3..4cab34f84e10b 100644
--- a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
@@ -42,6 +42,9 @@ import("//llvm/version.gni")
 # become declare_args if anyone wants to set them.
 
 declare_args() {
+  # Enable additional checks that alter the LLVM C++ ABI.
+  llvm_enable_abi_breaking_checks = llvm_enable_assertions
+
   # Iterate unordered llvm containers in reverse.
   llvm_enable_reverse_iteration = false
 

diff  --git a/llvm/utils/gn/secondary/llvm/test/BUILD.gn b/llvm/utils/gn/secondary/llvm/test/BUILD.gn
index 37399c7fd4485..56c81f49bf6b6 100644
--- a/llvm/utils/gn/secondary/llvm/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/test/BUILD.gn
@@ -197,12 +197,6 @@ write_lit_config("lit_site_cfg") {
     extra_values += [ "LLVM_ENABLE_EXPENSIVE_CHECKS=0" ]  # Must be 0.
   }
 
-  if (llvm_enable_abi_breaking_checks) {
-    extra_values += [ "LLVM_ENABLE_ABI_BREAKING_CHECKS=1" ]
-  } else {
-    extra_values += [ "LLVM_ENABLE_ABI_BREAKING_CHECKS=0" ]  # Must be 0.
-  }
-
   if (llvm_enable_threads) {
     extra_values += [ "LLVM_ENABLE_THREADS=1" ]
   } else {