From 46e416295a883e67e1084492469797071ef8cf17 Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Fri, 15 Dec 2017 12:49:42 +0100
Subject: [PATCH 1/2] Fix Issue 18083 - -w doesn't work for the ddoc build

---
 src/dmd/mars.d                     |  2 ++
 test/fail_compilation/ddoc_18083.d | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 test/fail_compilation/ddoc_18083.d

diff --git a/src/dmd/mars.d b/src/dmd/mars.d
index c50025111ce9..5626301fbbd1 100644
--- a/src/dmd/mars.d
+++ b/src/dmd/mars.d
@@ -1073,6 +1073,8 @@ Language changes listed by -transition=id:
             }
         }
     }
+    if (global.errors || global.warnings)
+        fatal();
     return status;
 }
 
diff --git a/test/fail_compilation/ddoc_18083.d b/test/fail_compilation/ddoc_18083.d
new file mode 100644
index 000000000000..514315d884fc
--- /dev/null
+++ b/test/fail_compilation/ddoc_18083.d
@@ -0,0 +1,16 @@
+// PERMUTE_ARGS:
+// REQUIRED_ARGS: -D -Dd${RESULTS_DIR}/fail_compilation -o- -w -c
+/* TEST_OUTPUT:
+---
+fail_compilation/ddoc_18083.d(13): Warning: Ddoc: function declaration has no parameter 'this'
+fail_compilation/ddoc_18083.d(13): Warning: Ddoc: parameter count mismatch
+---
+*/
+/**
+Params:
+  this = non-existent parameter
+*/
+int foo()
+{
+    return 1;
+}

From a511ed99856a70161ac56abaa23048867a895f4a Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Fri, 15 Dec 2017 13:44:32 +0100
Subject: [PATCH 2/2] Replace -w with -wi in existing DDoc tests

---
 test/compilable/ddoc10236.d  | 2 +-
 test/compilable/ddoc10236b.d | 2 +-
 test/compilable/ddoc13502.d  | 2 +-
 test/compilable/ddoc4899.d   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/compilable/ddoc10236.d b/test/compilable/ddoc10236.d
index 25738ec34e3c..1c547613c445 100644
--- a/test/compilable/ddoc10236.d
+++ b/test/compilable/ddoc10236.d
@@ -1,5 +1,5 @@
 // PERMUTE_ARGS:
-// REQUIRED_ARGS: -D -Dd${RESULTS_DIR}/compilable -w -o-
+// REQUIRED_ARGS: -D -Dd${RESULTS_DIR}/compilable -wi -o-
 
 /*
 TEST_OUTPUT:
diff --git a/test/compilable/ddoc10236b.d b/test/compilable/ddoc10236b.d
index d814d375c065..065ced0936c0 100644
--- a/test/compilable/ddoc10236b.d
+++ b/test/compilable/ddoc10236b.d
@@ -1,5 +1,5 @@
 // PERMUTE_ARGS:
-// REQUIRED_ARGS: -D -Dd${RESULTS_DIR}/compilable -w -o-
+// REQUIRED_ARGS: -D -Dd${RESULTS_DIR}/compilable -wi -o-
 
 /*
 TEST_OUTPUT:
diff --git a/test/compilable/ddoc13502.d b/test/compilable/ddoc13502.d
index 6ab2ca0614db..93f383fea9f1 100644
--- a/test/compilable/ddoc13502.d
+++ b/test/compilable/ddoc13502.d
@@ -1,5 +1,5 @@
 // PERMUTE_ARGS:
-// REQUIRED_ARGS: -D -Dd${RESULTS_DIR}/compilable -w -o-
+// REQUIRED_ARGS: -D -Dd${RESULTS_DIR}/compilable -wi -o-
 /*
 TEST_OUTPUT:
 ---
diff --git a/test/compilable/ddoc4899.d b/test/compilable/ddoc4899.d
index 1fbd6a9cbe84..b5cfa86367c1 100644
--- a/test/compilable/ddoc4899.d
+++ b/test/compilable/ddoc4899.d
@@ -1,5 +1,5 @@
 // PERMUTE_ARGS:
-// REQUIRED_ARGS: -D -Dd${RESULTS_DIR}/compilable -w -o-
+// REQUIRED_ARGS: -D -Dd${RESULTS_DIR}/compilable -wi -o-
 
 /*
 TEST_OUTPUT: