From: Iain Buclaw <ibuclaw@gdcproject.org>
Date: Sun, 19 Apr 2020 12:58:31 +0000 (+0200)
Subject: d/dmd: Merge upstream dmd ba99ee345
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=62f3d4ea899cc1d03e9cf9e1e80b6b4835b4e428;p=gcc.git

d/dmd: Merge upstream dmd ba99ee345

Initializes the VectorArrayExp::size field with the correct value.

Fixes: PR d/94652

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

diff --git a/gcc/d/dmd/MERGE b/gcc/d/dmd/MERGE
index 2922939a2da..cd3d48ded8e 100644
--- a/gcc/d/dmd/MERGE
+++ b/gcc/d/dmd/MERGE
@@ -1,4 +1,4 @@
-09be6ee1439ba12211678f3f1b591d1e986b7be0
+ba99ee345694da61eca7b555517d540ff3dc0a56
 
 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/expression.c b/gcc/d/dmd/expression.c
index ccfb4b69a29..c639fd10aae 100644
--- a/gcc/d/dmd/expression.c
+++ b/gcc/d/dmd/expression.c
@@ -5775,7 +5775,7 @@ Expression *VectorExp::syntaxCopy()
 /************************************************************/
 
 VectorArrayExp::VectorArrayExp(Loc loc, Expression *e1)
-        : UnaExp(loc, TOKvectorarray, sizeof(VectorExp), e1)
+        : UnaExp(loc, TOKvectorarray, sizeof(VectorArrayExp), e1)
 {
 }