d/dmd: Merge upstream dmd d517c0e6a

Fixes https://gcc.gnu.org/PR89016

Reviewed-on: https://github.com/dlang/dmd/pull/9427

From-SVN: r269465

9 files changed, 36 insertions, 1 deletions

diff --git a/gcc/testsuite/gdc.test/compilable/imports/test19609a.d b/gcc/testsuite/gdc.test/compilable/imports/test19609a.d
new file mode 100644
index 0000000..53d4f88
--- /dev/null
+++ b/gcc/testsuite/gdc.test/compilable/imports/test19609a.d
@@ -0,0 +1 @@
+deprecated([]) module imports.test19609a;
diff --git a/gcc/testsuite/gdc.test/compilable/imports/test19609b.d b/gcc/testsuite/gdc.test/compilable/imports/test19609b.d
new file mode 100644
index 0000000..91e26e2
--- /dev/null
+++ b/gcc/testsuite/gdc.test/compilable/imports/test19609b.d
@@ -0,0 +1 @@
+deprecated(['h','e','l','l','o']) module imports.test19609b;
diff --git a/gcc/testsuite/gdc.test/compilable/imports/test19609c.d b/gcc/testsuite/gdc.test/compilable/imports/test19609c.d
new file mode 100644
index 0000000..789585d
--- /dev/null
+++ b/gcc/testsuite/gdc.test/compilable/imports/test19609c.d
@@ -0,0 +1 @@
+deprecated(null) module imports.test19609c;
diff --git a/gcc/testsuite/gdc.test/fail_compilation/fail12567.d b/gcc/testsuite/gdc.test/compilable/test12567e.d
index e1ecd19..14c72bc 100644
--- a/gcc/testsuite/gdc.test/fail_compilation/fail12567.d
+++ b/gcc/testsuite/gdc.test/compilable/test12567e.d
@@ -2,7 +2,6 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail12567.d(8): Error: string expected, not '"a" ~ "b"'
 ---
 */
 deprecated("a" ~ "b") module fail12567;
diff --git a/gcc/testsuite/gdc.test/compilable/test19609.d b/gcc/testsuite/gdc.test/compilable/test19609.d
new file mode 100644
index 0000000..a3d6923
--- /dev/null
+++ b/gcc/testsuite/gdc.test/compilable/test19609.d
@@ -0,0 +1,12 @@
+// https://issues.dlang.org/show_bug.cgi?id=19609
+/*
+TEST_OUTPUT
+---
+compilable/test19609.d(10): Deprecation: module `imports.test19609a` is deprecated - 
+compilable/test19609.d(11): Deprecation: module `imports.test19609b` is deprecated - hello
+compilable/test19609.d(12): Deprecation: module `imports.test19609c` is deprecated -
+---
+*/
+import imports.test19609a;
+import imports.test19609b;
+import imports.test19609c;
diff --git a/gcc/testsuite/gdc.test/fail_compilation/fail19609.d b/gcc/testsuite/gdc.test/fail_compilation/fail19609.d
new file mode 100644
index 0000000..64d080a
--- /dev/null
+++ b/gcc/testsuite/gdc.test/fail_compilation/fail19609.d
@@ -0,0 +1,18 @@
+// https://issues.dlang.org/show_bug.cgi?id=19609
+/*
+TEST_OUTPUT
+---
+fail_compilation/imports/fail19609a.d(1): Error: `string` expected for deprecation message, not `([""])` of type `string[]`
+fail_compilation/fail19609.d(16): Deprecation: module `imports.fail19609a` is deprecated
+fail_compilation/imports/fail19609a.d(1): Error: `string` expected for deprecation message, not `([""])` of type `string[]`
+fail_compilation/imports/fail19609b.d(1): Error: `string` expected for deprecation message, not `([1])` of type `int[]`
+fail_compilation/fail19609.d(17): Deprecation: module `imports.fail19609b` is deprecated
+fail_compilation/imports/fail19609b.d(1): Error: `string` expected for deprecation message, not `([1])` of type `int[]`
+fail_compilation/imports/fail19609c.d(1): Error: `string` expected for deprecation message, not `(123.4F)` of type `float`
+fail_compilation/fail19609.d(18): Deprecation: module `imports.fail19609c` is deprecated
+fail_compilation/imports/fail19609c.d(1): Error: `string` expected for deprecation message, not `(123.4F)` of type `float`
+---
+*/
+import imports.fail19609a;
+import imports.fail19609b;
+import imports.fail19609c;
diff --git a/gcc/testsuite/gdc.test/fail_compilation/imports/fail19609a.d b/gcc/testsuite/gdc.test/fail_compilation/imports/fail19609a.d
new file mode 100644
index 0000000..6cf5d61
--- /dev/null
+++ b/gcc/testsuite/gdc.test/fail_compilation/imports/fail19609a.d
@@ -0,0 +1 @@
+deprecated([""]) module imports.fail19609a;
diff --git a/gcc/testsuite/gdc.test/fail_compilation/imports/fail19609b.d b/gcc/testsuite/gdc.test/fail_compilation/imports/fail19609b.d
new file mode 100644
index 0000000..2ba62fe
--- /dev/null
+++ b/gcc/testsuite/gdc.test/fail_compilation/imports/fail19609b.d
@@ -0,0 +1 @@
+deprecated([1]) module imports.fail19609b;
diff --git a/gcc/testsuite/gdc.test/fail_compilation/imports/fail19609c.d b/gcc/testsuite/gdc.test/fail_compilation/imports/fail19609c.d
new file mode 100644
index 0000000..4aadb60
--- /dev/null
+++ b/gcc/testsuite/gdc.test/fail_compilation/imports/fail19609c.d
@@ -0,0 +1 @@
+deprecated(123.4f) module imports.fail19609c;