aboutsummaryrefslogtreecommitdiff
path: root/gcc/d
diff options
context:
space:
mode:
authorIain Buclaw <ibuclaw@gdcproject.org>2020-04-19 14:58:31 +0200
committerIain Buclaw <ibuclaw@gdcproject.org>2020-04-19 15:07:29 +0200
commit62f3d4ea899cc1d03e9cf9e1e80b6b4835b4e428 (patch)
tree5e9b87e81bf8419d17a93666158f39a398fc957c /gcc/d
parentace4b1acba8dc9b54b77631d7afd146eaa992c3a (diff)
downloadgcc-62f3d4ea899cc1d03e9cf9e1e80b6b4835b4e428.zip
gcc-62f3d4ea899cc1d03e9cf9e1e80b6b4835b4e428.tar.gz
gcc-62f3d4ea899cc1d03e9cf9e1e80b6b4835b4e428.tar.bz2
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
Diffstat (limited to 'gcc/d')
-rw-r--r--gcc/d/dmd/MERGE2
-rw-r--r--gcc/d/dmd/expression.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/d/dmd/MERGE b/gcc/d/dmd/MERGE
index 2922939..cd3d48d 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 ccfb4b6..c639fd1 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)
{
}