diff options
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/d/dmd/MERGE | 2 | ||||
-rw-r--r-- | gcc/d/dmd/expression.d | 1 | ||||
-rw-r--r-- | gcc/testsuite/gdc.test/runnable/test21020.d | 11 |
3 files changed, 13 insertions, 1 deletions
diff --git a/gcc/d/dmd/MERGE b/gcc/d/dmd/MERGE index 1be4da4..f274580 100644 --- a/gcc/d/dmd/MERGE +++ b/gcc/d/dmd/MERGE @@ -1,4 +1,4 @@ -fde0f8c40a1b8eb78c3485cb0e940035bfe6fb00 +8db14cf8467ca25256904d51169b176c9c89afb1 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.d b/gcc/d/dmd/expression.d index ef5c0b0..4bf1f9f 100644 --- a/gcc/d/dmd/expression.d +++ b/gcc/d/dmd/expression.d @@ -3632,6 +3632,7 @@ extern (C++) final class CastExp : UnaExp if (rvalue || !e1.isLvalue()) return false; return (to.ty == Tsarray && (e1.type.ty == Tvector || e1.type.ty == Tsarray)) || + (to.ty == Taarray && e1.type.ty == Taarray) || e1.type.mutableOf.unSharedOf().equals(to.mutableOf().unSharedOf()); } diff --git a/gcc/testsuite/gdc.test/runnable/test21020.d b/gcc/testsuite/gdc.test/runnable/test21020.d new file mode 100644 index 0000000..484db30 --- /dev/null +++ b/gcc/testsuite/gdc.test/runnable/test21020.d @@ -0,0 +1,11 @@ +// https://github.com/dlang/dmd/issues/21020 + +shared struct Queue { + int[int] map; +} + +void main() { + auto queue = Queue(); + (cast(int[int]) queue.map)[1] = 2; + assert(queue.map[1] == 2); +} |