From 258ad81197cbd24452286d38975b0302342cffe0 Mon Sep 17 00:00:00 2001
From: Iain Buclaw <ibuclaw@gcc.gnu.org>
Date: Thu, 11 Apr 2019 21:10:49 +0000
Subject: [PATCH] d/dmd: Merge upstream dmd d7ed327ed

Fixes ICE when accessing empty array in CTFE.

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

From-SVN: r270294
---
 gcc/d/dmd/MERGE                               | 2 +-
 gcc/d/dmd/dinterpret.c                        | 7 +++++--
 gcc/testsuite/gdc.test/compilable/test19778.d | 6 ++++++
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 gcc/testsuite/gdc.test/compilable/test19778.d

diff --git a/gcc/d/dmd/MERGE b/gcc/d/dmd/MERGE
index 31ea106965b..800be95e4e6 100644
--- a/gcc/d/dmd/MERGE
+++ b/gcc/d/dmd/MERGE
@@ -1,4 +1,4 @@
-5dd3eccc3b0758346f77bee3cdc3f6bd15de339b
+d7ed327edb0b01ad56e7e73e77b3401cd565675e
 
 The first line of this file holds the git revision number of the last
 merge done from the dlang/dmd repository.
diff --git a/gcc/d/dmd/dinterpret.c b/gcc/d/dmd/dinterpret.c
index 777f89cf186..40f3e77cbc5 100644
--- a/gcc/d/dmd/dinterpret.c
+++ b/gcc/d/dmd/dinterpret.c
@@ -6272,11 +6272,14 @@ Expression *scrubReturnValue(Loc loc, Expression *e)
 /* Returns: true if e is void,
  * or is an array literal or struct literal of void elements.
  */
-static bool isVoid(Expression *e)
+static bool isVoid(Expression *e, bool checkArray = false)
 {
     if (e->op == TOKvoid)
         return true;
 
+    if (checkArray && e->type->ty != Tsarray)
+        return false;
+
     if (e->op == TOKarrayliteral)
         return isEntirelyVoid(((ArrayLiteralExp *)e)->elements);
 
@@ -6314,7 +6317,7 @@ Expression *scrubArray(Loc loc, Expressions *elems, bool structlit)
 
         // A struct .init may contain void members.
         // Static array members are a weird special case (bug 10994).
-        if (structlit && isVoid(e))
+        if (structlit && isVoid(e, true))
         {
             e = NULL;
         }
diff --git a/gcc/testsuite/gdc.test/compilable/test19778.d b/gcc/testsuite/gdc.test/compilable/test19778.d
new file mode 100644
index 00000000000..87905fae6a0
--- /dev/null
+++ b/gcc/testsuite/gdc.test/compilable/test19778.d
@@ -0,0 +1,6 @@
+struct S
+{
+    int[] data;
+}
+immutable X = S([]);
+enum len = X.data.length;
-- 
2.30.2