From 64db53ff04037b0cb583f539b5e600f7336474b2 Mon Sep 17 00:00:00 2001
From: Mathias Lang <mathias.lang@sociomantic.com>
Date: Mon, 28 Nov 2016 21:50:49 +0100
Subject: [PATCH] Implement -assert=[on|off] to enable/disable asserts on
 demand

---
 src/mars.d                        | 15 +++++++++++++++
 test/runnable/assert_switch_off.d | 10 ++++++++++
 test/runnable/assert_switch_on.d  | 13 +++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 test/runnable/assert_switch_off.d
 create mode 100644 test/runnable/assert_switch_on.d

diff --git a/src/mars.d b/src/mars.d
index b1732406f159..d84c8d1026a9 100644
--- a/src/mars.d
+++ b/src/mars.d
@@ -103,6 +103,7 @@ Where:
 <option>:
   @<cmdfile>       read arguments from cmdfile
   -allinst         generate code for all template instantiations
+  -assert=[on|off] Turn asserts on/off, regardless of the compilation mode
   -betterC         omit generating some runtime information and helper functions
   -boundscheck=[on|safeonly|off]   bounds checks on, in @safe only, or off
   -c               do not link
@@ -367,6 +368,8 @@ private int tryMain(size_t argc, const(char)** argv)
             printf("arguments[%d] = '%s'\n", i, arguments[i]);
         }
     }
+
+    byte assert_flag; // 0 => Default, < 0 => No, > 0 => Yes
     for (size_t i = 1; i < arguments.dim; i++)
     {
         const(char)* p = arguments[i];
@@ -374,6 +377,15 @@ private int tryMain(size_t argc, const(char)** argv)
         {
             if (strcmp(p + 1, "allinst") == 0)
                 global.params.allInst = true;
+            else if (strncmp(p + 1, "assert", "assert".length) == 0)
+            {
+                if (strcmp(p, "-assert=on") == 0)
+                    assert_flag = 1;
+                else if (strcmp(p, "-assert=off") == 0)
+                    assert_flag = -1;
+                else
+                    goto Lerror;
+            }
             else if (strcmp(p + 1, "de") == 0)
                 global.params.useDeprecated = 0;
             else if (strcmp(p + 1, "d") == 0)
@@ -1104,6 +1116,9 @@ Language changes listed by -transition=id:
         }
     }
 
+    if (assert_flag != 0)
+        global.params.useAssert = assert_flag > 0 ? true : false;
+
     // Predefined version identifiers
     addDefaultVersionIdentifiers();
     objc_tryMain_dObjc();
diff --git a/test/runnable/assert_switch_off.d b/test/runnable/assert_switch_off.d
new file mode 100644
index 000000000000..684ebd87de3e
--- /dev/null
+++ b/test/runnable/assert_switch_off.d
@@ -0,0 +1,10 @@
+// REQUIRED_ARGS: -assert=off
+
+void main ()
+{
+    // If asserts are on => assert gets triggered
+    // If they are off => The assert 'pass'
+    int i = 42;
+
+    assert(i == 0);
+}
diff --git a/test/runnable/assert_switch_on.d b/test/runnable/assert_switch_on.d
new file mode 100644
index 000000000000..2ea199a21c5b
--- /dev/null
+++ b/test/runnable/assert_switch_on.d
@@ -0,0 +1,13 @@
+// REQUIRED_ARGS: -release -assert=on
+
+import core.exception;
+
+void main ()
+{
+    // If asserts are off => assert(0) leads to a SEGV
+    // If they are on => The exception is caught as expected
+    try { assert(0); }
+    catch (AssertError e) return;
+
+    assert(0);
+}