diff options
| author | Iain Buclaw <ibuclaw@gcc.gnu.org> | 2019-06-16 07:47:57 +0000 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gcc.gnu.org> | 2019-06-16 07:47:57 +0000 |
| commit | 22682e5b5f7cc596b165534ad9b8f201354126ce (patch) | |
| tree | 4e8184feeaa8e54c00a63c686a0b785a8829dadd /gcc/d/dmd | |
| parent | 347f5c885f33bcd905d601faa5a93b01715eacf8 (diff) | |
| download | gcc-22682e5b5f7cc596b165534ad9b8f201354126ce.zip gcc-22682e5b5f7cc596b165534ad9b8f201354126ce.tar.gz gcc-22682e5b5f7cc596b165534ad9b8f201354126ce.tar.bz2 | |
re PR d/90661 (ICE in AlignDeclaration::syntaxCopy, at d/dmd/attrib.c:670)
PR d/90661
d/dmd: Merge upstream dmd c74e624c9
Fixes segmentation fault in AlignDeclaration::syntaxCopy.
Reviewed-on: https://github.com/dlang/dmd/pull/10001
From-SVN: r272341
Diffstat (limited to 'gcc/d/dmd')
| -rw-r--r-- | gcc/d/dmd/MERGE | 2 | ||||
| -rw-r--r-- | gcc/d/dmd/attrib.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gcc/d/dmd/MERGE b/gcc/d/dmd/MERGE index e100264..6edc63a 100644 --- a/gcc/d/dmd/MERGE +++ b/gcc/d/dmd/MERGE @@ -1,4 +1,4 @@ -78dc311524341a76008b341ff6427e5a16e285db +c74e624c9a0a9e7e39f96b2f005f86e123df56c9 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/attrib.c b/gcc/d/dmd/attrib.c index a668638..6cd715c 100644 --- a/gcc/d/dmd/attrib.c +++ b/gcc/d/dmd/attrib.c @@ -667,7 +667,8 @@ Dsymbol *AlignDeclaration::syntaxCopy(Dsymbol *s) { assert(!s); return new AlignDeclaration(loc, - ealign->syntaxCopy(), Dsymbol::arraySyntaxCopy(decl)); + ealign ? ealign->syntaxCopy() : NULL, + Dsymbol::arraySyntaxCopy(decl)); } Scope *AlignDeclaration::newScope(Scope *sc) |