Skip to content

add eSink to inferInitializerType() #23581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WalterBright merged 1 commit into from
Aug 14, 2026
+18 −16
Merged

add eSink to inferInitializerType() #23581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/src/dmd/dsymbolsem.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2379,7 +2379,7 @@ private extern(C++) final class DsymbolSemanticVisitor : Visitor
return;
}
//printf("inferring type for %s with init %s\n", dsym.toChars(), dsym._init.toChars());
dsym._init = dsym._init.inferInitializerType(sc, dsym.type);
dsym._init = dsym._init.inferInitializerType(sc, dsym.type, global.errorSink);
dsym.type = dsym._init.initializerToExpression(null, sc.inCfile).type;

if (autoDollarDims.length)
Expand Down
32 changes: 17 additions & 15 deletions compiler/src/dmd/initsem.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import dmd.dsymbol;
import dmd.dsymbolsem;
import dmd.dtemplate;
import dmd.errors;
import dmd.errorsink;
import dmd.expression;
import dmd.expressionsem;
import dmd.func;
Expand Down Expand Up @@ -1218,20 +1219,21 @@ Initializer initializerSemantic(Initializer init, Scope* sc, ref Type tx, NeedIn
* init = `Initializer` AST node
* sc = context
* itype = the type of the parsed declaration, null for `auto`
* eSink = error message sink
* Returns:
* an equivalent `ExpInitializer` if successful, or `ErrorInitializer` if it cannot be translated
*/
Initializer inferInitializerType(Initializer init, Scope* sc, Type itype)
Initializer inferInitializerType(Initializer init, Scope* sc, Type itype, ErrorSink eSink)
{
Initializer visitVoid(VoidInitializer i)
{
error(i.loc, "cannot infer type from void initializer");
eSink.error(i.loc, "cannot infer type from void initializer");
return new ErrorInitializer();
}

Initializer visitDefault(DefaultInitializer i)
{
error(i.loc, "cannot infer type from default initializer");
eSink.error(i.loc, "cannot infer type from default initializer");
return new ErrorInitializer();
}

Expand All @@ -1242,7 +1244,7 @@ Initializer inferInitializerType(Initializer init, Scope* sc, Type itype)

Initializer visitStruct(StructInitializer i)
{
error(i.loc, "cannot infer type from struct initializer");
eSink.error(i.loc, "cannot infer type from struct initializer");
return new ErrorInitializer();
}

Expand All @@ -1254,9 +1256,9 @@ Initializer inferInitializerType(Initializer init, Scope* sc, Type itype)
Initializer no()
{
if (keys)
error(init.loc, "not an associative array initializer");
eSink.error(init.loc, "not an associative array initializer");
else
error(init.loc, "cannot infer type from array initializer");
eSink.error(init.loc, "cannot infer type from array initializer");
return new ErrorInitializer();
}
const bool isAssoc = itype && itype.ty == Taarray ||
Expand All @@ -1283,7 +1285,7 @@ Initializer inferInitializerType(Initializer init, Scope* sc, Type itype)
// sanity check: some arbitrary limit that allows a 32-bit process to continue
if (nidx > uint.max / 32)
{
error(init.loc, "array index %lld not supported", nidx);
eSink.error(init.loc, "array index %lld not supported", nidx);
return new ErrorInitializer();
}
idx = cast(uint)nidx;
Expand All @@ -1296,14 +1298,14 @@ Initializer inferInitializerType(Initializer init, Scope* sc, Type itype)
}
else if ((*values)[idx])
{
error(init.loc, "array index %d initialized twice", cast(int)idx);
eSink.error(init.loc, "array index %d initialized twice", cast(int)idx);
return new ErrorInitializer();
}
}
Initializer iz = init.value[i];
if (!iz)
return no();
iz = iz.inferInitializerType(sc, itype ? itype.nextOf() : null);
iz = iz.inferInitializerType(sc, itype ? itype.nextOf() : null, eSink);
if (iz.isErrorInitializer())
{
return iz;
Expand All @@ -1317,7 +1319,7 @@ Initializer inferInitializerType(Initializer init, Scope* sc, Type itype)
? new AssocArrayLiteralExp(init.loc, keys, values)
: new ArrayLiteralExp(init.loc, null, values);
auto ei = new ExpInitializer(init.loc, e);
return ei.inferInitializerType(sc, itype);
return ei.inferInitializerType(sc, itype, eSink);
}

Initializer visitExp(ExpInitializer init)
Expand All @@ -1334,9 +1336,9 @@ Initializer inferInitializerType(Initializer init, Scope* sc, Type itype)
{
TemplateInstance ti = se.sds.isTemplateInstance();
if (ti && ti.semanticRun == PASS.semantic && !ti.aliasdecl)
error(se.loc, "cannot infer type from %s `%s`, possible circular dependency", se.sds.kind(), se.toErrMsg());
eSink.error(se.loc, "cannot infer type from %s `%s`, possible circular dependency", se.sds.kind(), se.toErrMsg());
else
error(se.loc, "cannot infer type from %s `%s`", se.sds.kind(), se.toErrMsg());
eSink.error(se.loc, "cannot infer type from %s `%s`", se.sds.kind(), se.toErrMsg());
return new ErrorInitializer();
}

Expand All @@ -1350,15 +1352,15 @@ Initializer inferInitializerType(Initializer init, Scope* sc, Type itype)
}
if (hasOverloads && !f.isUnique())
{
error(init.exp.loc, "cannot infer type from overloaded function symbol `%s`", init.exp.toErrMsg());
eSink.error(init.exp.loc, "cannot infer type from overloaded function symbol `%s`", init.exp.toErrMsg());
return new ErrorInitializer();
}
}
if (auto ae = init.exp.isAddrExp())
{
if (ae.e1.op == EXP.overloadSet)
{
error(init.exp.loc, "cannot infer type from overloaded function symbol `%s`", init.exp.toErrMsg());
eSink.error(init.exp.loc, "cannot infer type from overloaded function symbol `%s`", init.exp.toErrMsg());
return new ErrorInitializer();
}
}
Expand All @@ -1376,7 +1378,7 @@ Initializer inferInitializerType(Initializer init, Scope* sc, Type itype)
Initializer visitC(CInitializer i)
{
//printf("CInitializer.inferInitializerType()\n");
error(i.loc, "TODO C inferInitializerType initializers not supported yet");
eSink.error(i.loc, "TODO C inferInitializerType initializers not supported yet");
return new ErrorInitializer();
}

Expand Down
Loading