diff options
| author | Iain Buclaw <ibuclaw@gcc.gnu.org> | 2019-06-16 07:49:43 +0000 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gcc.gnu.org> | 2019-06-16 07:49:43 +0000 |
| commit | af1b88ee7b46234bd68593cfdf7ef3546024c635 (patch) | |
| tree | 736278728ee04a63e7e8af4578e6683e2ee3fcea | |
| parent | 87dda41e5a149c802df7b82dfcfe734081ff5f89 (diff) | |
| download | gcc-af1b88ee7b46234bd68593cfdf7ef3546024c635.zip gcc-af1b88ee7b46234bd68593cfdf7ef3546024c635.tar.gz gcc-af1b88ee7b46234bd68593cfdf7ef3546024c635.tar.bz2 | |
re PR d/90560 (ICE in visit, at d/dmd/dcast.c:1872)
PR d/90560
d/dmd: Merge upstream dmd c6887d9bb
Fixes segmentation fault in castTo::CastTo::visit.
Reviewed-on: https://github.com/dlang/dmd/pull/10007
From-SVN: r272348
| -rw-r--r-- | gcc/d/dmd/MERGE | 2 | ||||
| -rw-r--r-- | gcc/d/dmd/mtype.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/gdc.test/fail_compilation/fail19890a.d | 7 | ||||
| -rw-r--r-- | gcc/testsuite/gdc.test/fail_compilation/fail19890b.d | 7 |
4 files changed, 16 insertions, 3 deletions
diff --git a/gcc/d/dmd/MERGE b/gcc/d/dmd/MERGE index 36f9aa9..3e3e718 100644 --- a/gcc/d/dmd/MERGE +++ b/gcc/d/dmd/MERGE @@ -1,4 +1,4 @@ -b0cd591770fefb4db6eaba89b7a548ef1e980f5c +c6887d9bbbe7b68e03ba3bccbf61432c1b369386 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/mtype.c b/gcc/d/dmd/mtype.c index 1757b49..2b1c5a1 100644 --- a/gcc/d/dmd/mtype.c +++ b/gcc/d/dmd/mtype.c @@ -4134,8 +4134,7 @@ Type *TypeSArray::semantic(Loc loc, Scope *sc) * when the bottom of element type is opaque. */ } - else if (tbn->isintegral() || - tbn->isfloating() || + else if (tbn->isTypeBasic() || tbn->ty == Tpointer || tbn->ty == Tarray || tbn->ty == Tsarray || diff --git a/gcc/testsuite/gdc.test/fail_compilation/fail19890a.d b/gcc/testsuite/gdc.test/fail_compilation/fail19890a.d new file mode 100644 index 0000000..57c4caf --- /dev/null +++ b/gcc/testsuite/gdc.test/fail_compilation/fail19890a.d @@ -0,0 +1,7 @@ +// PERMUTE_ARGS: +/* +--- +fail_compilation/fail19890a.d(8): Error: `void[/^[0-9]+(LU)?$/]` size 1 * /^[0-9]+$/ exceeds 0x7fffffff size limit for static array +--- +*/ +void[] f = cast(void[-1]) "a"; diff --git a/gcc/testsuite/gdc.test/fail_compilation/fail19890b.d b/gcc/testsuite/gdc.test/fail_compilation/fail19890b.d new file mode 100644 index 0000000..a9b1874 --- /dev/null +++ b/gcc/testsuite/gdc.test/fail_compilation/fail19890b.d @@ -0,0 +1,7 @@ +// PERMUTE_ARGS: +/* +--- +fail_compilation/fail19890b.d(8): Error: `void[/^[0-9]+(LU)?$/]` size 1 * /^[0-9]+$/ exceeds 0x7fffffff size limit for static array +--- +*/ +void[] f = cast(void[-2]) "a"; |