d: Merge upstream dmd 1b5a53d01.
Fixes an ICE in setValue at dmd/dinterpret.c:7046 This was originally seen when running the testsuite for a 16-bit target, however, it could be reproduced on 32-bit using long[] as well. Reviewed-on: https://github.com/dlang/dmd/pull/11547 gcc/d/ChangeLog: * dmd/MERGE: Merge upstream dmd 1b5a53d01.
This commit is contained in:
parent
00cb0f5840
commit
15717b4784
@ -1,4 +1,4 @@
|
||||
c2274e56a3220ea636c6199fd06cd54fcdf6bad9
|
||||
1b5a53d01c465109ce47edf49ace6143b69b118b
|
||||
|
||||
The first line of this file holds the git revision number of the last
|
||||
merge done from the dlang/dmd repository.
|
||||
|
@ -1913,7 +1913,7 @@ bool isCtfeValueValid(Expression *newval)
|
||||
// e1 should be a CTFE reference
|
||||
Expression *e1 = ((AddrExp *)newval)->e1;
|
||||
return tb->ty == Tpointer &&
|
||||
((e1->op == TOKstructliteral && isCtfeValueValid(e1)) ||
|
||||
(((e1->op == TOKstructliteral || e1->op == TOKarrayliteral) && isCtfeValueValid(e1)) ||
|
||||
(e1->op == TOKvar) ||
|
||||
(e1->op == TOKdotvar && isCtfeReferenceValid(e1)) ||
|
||||
(e1->op == TOKindex && isCtfeReferenceValid(e1)) ||
|
||||
|
@ -1947,15 +1947,6 @@ public:
|
||||
Type *elemtype = ((TypeArray *)(val->type))->next;
|
||||
d_uns64 elemsize = elemtype->size();
|
||||
|
||||
// It's OK to cast from fixed length to dynamic array, eg &int[3] to int[]*
|
||||
if (val->type->ty == Tsarray && pointee->ty == Tarray &&
|
||||
elemsize == pointee->nextOf()->size())
|
||||
{
|
||||
new(pue) AddrExp(e->loc, val, e->type);
|
||||
result = pue->exp();
|
||||
return;
|
||||
}
|
||||
|
||||
// It's OK to cast from fixed length to fixed length array, eg &int[n] to int[d]*.
|
||||
if (val->type->ty == Tsarray && pointee->ty == Tsarray &&
|
||||
elemsize == pointee->nextOf()->size())
|
||||
|
@ -3235,6 +3235,44 @@ int ctfeSort6250()
|
||||
|
||||
static assert(ctfeSort6250() == 57);
|
||||
|
||||
/**************************************************/
|
||||
|
||||
long[]* simple6250b(long[]* x) { return x; }
|
||||
|
||||
void swap6250b(long[]* lhs, long[]* rhs)
|
||||
{
|
||||
long[] kk = *lhs;
|
||||
assert(simple6250b(lhs) == lhs);
|
||||
lhs = simple6250b(lhs);
|
||||
assert(kk[0] == 18);
|
||||
assert((*lhs)[0] == 18);
|
||||
assert((*rhs)[0] == 19);
|
||||
*lhs = *rhs;
|
||||
assert((*lhs)[0] == 19);
|
||||
*rhs = kk;
|
||||
assert(*rhs == kk);
|
||||
assert(kk[0] == 18);
|
||||
assert((*rhs)[0] == 18);
|
||||
}
|
||||
|
||||
long ctfeSort6250b()
|
||||
{
|
||||
long[][2] x;
|
||||
long[3] a = [17, 18, 19];
|
||||
x[0] = a[1 .. 2];
|
||||
x[1] = a[2 .. $];
|
||||
assert(x[0][0] == 18);
|
||||
assert(x[0][1] == 19);
|
||||
swap6250b(&x[0], &x[1]);
|
||||
assert(x[0][0] == 19);
|
||||
assert(x[1][0] == 18);
|
||||
a[1] = 57;
|
||||
assert(x[0][0] == 19);
|
||||
return x[1][0];
|
||||
}
|
||||
|
||||
static assert(ctfeSort6250b() == 57);
|
||||
|
||||
/**************************************************
|
||||
6672 circular references in array
|
||||
**************************************************/
|
||||
|
29
gcc/testsuite/gdc.test/fail_compilation/reg6769.d
Normal file
29
gcc/testsuite/gdc.test/fail_compilation/reg6769.d
Normal file
@ -0,0 +1,29 @@
|
||||
/*
|
||||
TEST_OUTPUT
|
||||
---
|
||||
fail_compilation/reg6769.d(14): Error: reinterpreting cast from `int[]` to `int[7]*` is not supported in CTFE
|
||||
fail_compilation/reg6769.d(27): called from here: `reg6769a([0, 1, 2, 3, 4, 5, 6])`
|
||||
fail_compilation/reg6769.d(27): while evaluating: `static assert(reg6769a([0, 1, 2, 3, 4, 5, 6]) == 1)`
|
||||
fail_compilation/reg6769.d(20): Error: reinterpreting cast from `int[7]` to `int[]*` is not supported in CTFE
|
||||
fail_compilation/reg6769.d(28): called from here: `reg6769b([0, 1, 2, 3, 4, 5, 6])`
|
||||
fail_compilation/reg6769.d(28): while evaluating: `static assert(reg6769b([0, 1, 2, 3, 4, 5, 6]) == 1)`
|
||||
---
|
||||
*/
|
||||
int reg6769a(int[] a)
|
||||
{
|
||||
int[7]* b = cast(int[7]*)&a;
|
||||
return (*b)[1];
|
||||
}
|
||||
|
||||
int reg6769b(int[7] a)
|
||||
{
|
||||
int[]* b = cast(int[]*)&a;
|
||||
return (*b)[1];
|
||||
}
|
||||
|
||||
void main()
|
||||
{
|
||||
// Both should never succeed, run-time would raise a SEGV.
|
||||
static assert(reg6769a([0,1,2,3,4,5,6]) == 1);
|
||||
static assert(reg6769b([0,1,2,3,4,5,6]) == 1);
|
||||
}
|
Loading…
Reference in New Issue
Block a user