From 6c7df23338994818a304cb7082c647928a23da76 Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Fri, 29 Dec 2017 16:05:30 +0100
Subject: [PATCH] Fix Issue 18141 - [REG2.078a] dmd -v no longer prints predefs

---
 src/dmd/mars.d             |  7 ++++---
 test/runnable/test18141.sh | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100755 test/runnable/test18141.sh

diff --git a/src/dmd/mars.d b/src/dmd/mars.d
index c50025111ce9..6344b54cd8d5 100644
--- a/src/dmd/mars.d
+++ b/src/dmd/mars.d
@@ -1425,11 +1425,12 @@ private void addDefaultVersionIdentifiers()
 
 private void printPredefinedVersions()
 {
-    if (global.params.verbose && global.params.versionids)
+    if (global.params.verbose && global.versionids)
     {
         fprintf(global.stdmsg, "predefs  ");
-        foreach (const s; *global.params.versionids)
-            fprintf(global.stdmsg, " %s", s);
+        foreach (const str; *global.versionids)
+            fprintf(global.stdmsg, " %s", str.toChars);
+
         fprintf(global.stdmsg, "\n");
     }
 }
diff --git a/test/runnable/test18141.sh b/test/runnable/test18141.sh
new file mode 100755
index 000000000000..321ab67c6304
--- /dev/null
+++ b/test/runnable/test18141.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+dir=${RESULTS_DIR}${SEP}runnable
+output_file=${dir}/test18141.sh.out
+
+set -e
+
+if [ "${OS}" == "win32" -o "${OS}" == "win64" ]; then
+    expected="Windows"
+else
+    expected="Posix"
+fi
+
+echo "void main(){}" | "${DMD}" -v -o- - | grep "predefs" | grep "${expected}" > "${output_file}"