diff mbox series

[committed,2/2] d/dmd: Merge upstream dmd ba99ee345 (PR94642)

Message ID 20200419133530.8088-1-ibuclaw@gdcproject.org
State New
Headers show
Series [committed,1/2] d/dmd: Merge upstream dmd 09be6ee14 (PR94653) | expand

Commit Message

Iain Buclaw April 19, 2020, 1:35 p.m. UTC 
Hi,

This patch merges the D front-end implementation with dmd upstream
ba99ee345.  Initializes the VectorArrayExp::size field with the correct
value, fixing PR94642.

Bootstrapped and regression tested on x86_64-linux-gnu, and committed to
mainline.

Regards
Iain.

---
 gcc/d/dmd/MERGE        | 2 +-
 gcc/d/dmd/expression.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

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)
 {
 }