mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-26 13:10:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix #20621 Comparing addresses of rvalue reference parameters not correct (#20622)

Browse source
This commit is contained in:
Walter Bright 2024-12-31 01:00:03 -08:00 • committed by GitHub
parent 1fa6c0a960
commit c57da0cf59
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 38 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/src/dmd/backend/inliner.d
View file

@ -516,7 +516,20 @@ private elem* initializeParamsWithArgs(elem* eargs, SYMIDX sistart, SYMIDX siend
{
if (log) printf("detected slice with %s\n", s.Sident.ptr);
auto s2 = nextSymbol(si);
if (!s2) { symbol_print(*s); elem_print(e); assert(0); }
if (!s2)
{
for (size_t m = args.length; m; --m)
{
elem* ex = args[m - 1];
printf("arg[%d]\n", cast(int) m);
elem_print(ex);
}
printf("function: %s\n", funcsym_p.Sident.ptr);
printf("szs: %d sze: %d\n", cast(int)szs, cast(int)sze);
printf("detected slice with %s\n", s.Sident.ptr);
symbol_print(*s); elem_print(e); assert(0);
}
assert(szs == type_size(s2.Stype));
const ty = s.Stype.Tty;

13
compiler/src/dmd/constfold.d
View file

@ -806,6 +806,7 @@ UnionExp Equal(EXP op, const ref Loc loc, Type type, Expression e1, Expression e
UnionExp Identity(EXP op, const ref Loc loc, Type type, Expression e1, Expression e2)
{
//printf("Identity %s %s\n", e1.toChars(), e2.toChars());
UnionExp ue = void;
int cmp;
if (e1.op == EXP.null_)
@ -820,7 +821,17 @@ UnionExp Identity(EXP op, const ref Loc loc, Type type, Expression e1, Expressio
{
SymOffExp es1 = e1.isSymOffExp();
SymOffExp es2 = e2.isSymOffExp();
cmp = (es1.var == es2.var && es1.offset == es2.offset);
cmp = es1.offset == es2.offset;
if (cmp)
{
cmp = es1.var == es2.var;
if (!cmp && (es1.var.isParameter() || es2.var.isParameter()))
{
// because of ref's, they may still be the same, we cannot tell
cantExp(ue);
return ue;
}
}
}
else
{

10
compiler/src/dmd/e2ir.d
View file

@ -113,6 +113,11 @@ bool ISX64REF(Declaration var)
|| (var.storage_class & STC.lazy_)
|| (var.type.isTypeStruct() && var.type.isTypeStruct().sym.hasCopyConstruction());
}
else if (target.os & Target.OS.Windows)
{
auto ts = var.type.isTypeStruct();
return !(var.storage_class & STC.lazy_) && ts && ts.sym.hasMoveCtor && ts.sym.hasCopyCtor;
}
else if (target.os & Target.OS.Posix)
{
return !(var.storage_class & STC.lazy_) && var.type.isTypeStruct() && !var.type.isTypeStruct().sym.isPOD();
@ -131,6 +136,11 @@ bool ISX64REF(ref IRState irs, Expression exp)
return exp.type.size(Loc.initial) > registerSize
|| (exp.type.isTypeStruct() && exp.type.isTypeStruct().sym.hasCopyConstruction());
}
else if (irs.target.os & Target.OS.Windows)
{
auto ts = exp.type.isTypeStruct();
return ts && ts.sym.hasMoveCtor && ts.sym.hasCopyCtor;
}
else if (irs.target.os & Target.OS.Posix)
{
return exp.type.isTypeStruct() && !exp.type.isTypeStruct().sym.isPOD();

2
compiler/test/runnable/rvalue1.d
View file

@ -55,6 +55,8 @@ struct S4
{
void* p;
this(ref S4) { }
this(S4 s)
{
assert(&s is &x); // confirm the rvalue reference