[build-script] Add plumbing for llbuild assertions

This adds two flags to the build script to enable/disable assertions in
llbuild: --llbuild-assertions, --no-llbuild-assertions

The default value is taken from the global assertions flag.

Author: aciidgh

utils/build-script

@@ -488,6 +488,8 @@ class BuildScriptInvocation(object):
                 args.swift_stdlib_assertions).lower(),
             "--swift-analyze-code-coverage", str(
                 args.swift_analyze_code_coverage).lower(),
+            "--llbuild-enable-assertions", str(
+                args.llbuild_assertions).lower(),
             "--cmake-generator", args.cmake_generator,
             "--build-jobs", str(args.build_jobs),
             "--common-cmake-options=%s" % ' '.join(

utils/build-script-impl

@@ -2354,7 +2354,7 @@ for host in "${ALL_HOSTS[@]}"; do
                     -DLIT_EXECUTABLE:PATH="${LLVM_SOURCE_DIR}/utils/lit/lit.py"
                     -DFILECHECK_EXECUTABLE:PATH="$(build_directory_bin ${LOCAL_HOST} llvm)/FileCheck"
                     -DCMAKE_BUILD_TYPE:STRING="${LLBUILD_BUILD_TYPE}"
-                    -DLLVM_ENABLE_ASSERTIONS:BOOL=$(true_false "${LLBUILD_ENABLE_ASSERTIONS}")
+                    -DLLBUILD_ENABLE_ASSERTIONS:BOOL=$(true_false "${LLBUILD_ENABLE_ASSERTIONS}")
                 )
                 ;;
             swiftpm)

utils/build_swift/driver_arguments.py

@@ -105,6 +105,9 @@ def _apply_default_arguments(args):
     if args.swift_stdlib_assertions is None:
         args.swift_stdlib_assertions = args.assertions
 
+    if args.llbuild_assertions is None:
+        args.llbuild_assertions = args.assertions
+
     # Set the default CMake generator.
     if args.cmake_generator is None:
         args.cmake_generator = 'Ninja'
@@ -642,6 +645,13 @@ def create_argument_parser():
            const=False,
            help='disable assertions in LLDB')
 
+    option('--llbuild-assertions', store,
+           const=True,
+           help='enable assertions in llbuild')
+    option('--no-llbuild-assertions', store('llbuild_assertions'),
+           const=False,
+           help='disable assertions in llbuild')
+
     # -------------------------------------------------------------------------
     in_group('Select the CMake generator')
 

utils/build_swift/tests/expected_options.py

@@ -135,6 +135,7 @@
     'libdispatch_build_variant': 'Debug',
     'libicu_build_variant': 'Debug',
     'lit_args': '-sv',
+    'llbuild_assertions': True,
     'lldb_assertions': None,
     'lldb_build_variant': 'Debug',
     'lldb_build_with_xcode': '1',
@@ -356,6 +357,7 @@ class IgnoreOption(_BaseOption):
     SetOption('--cmark-assertions', value=True),
     SetOption('--lldb-assertions', value=True),
     SetOption('--llvm-assertions', value=True),
+    SetOption('--llbuild-assertions', value=True),
     SetOption('--swift-assertions', value=True),
     SetOption('--swift-stdlib-assertions', value=True),
     SetOption('-T', dest='validation_test', value=True),
@@ -367,6 +369,8 @@ class IgnoreOption(_BaseOption):
     SetOption('--no-assertions', dest='assertions', value=False),
     SetOption('--no-lldb-assertions', dest='lldb_assertions', value=False),
     SetOption('--no-llvm-assertions', dest='llvm_assertions', value=False),
+    SetOption('--no-llbuild-assertions',
+              dest='llbuild_assertions', value=False),
     SetOption('--no-swift-assertions', dest='swift_assertions', value=False),
     SetOption('--no-swift-stdlib-assertions',
               dest='swift_stdlib_assertions', value=False),