Skip to content
Open
Changes from all commits
Commits
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
26 changes: 10 additions & 16 deletions compiler/src/dmd/semantic3.d
Original file line number Diff line number Diff line change
Expand Up @@ -1707,25 +1707,19 @@ private struct FuncDeclSem3

extern (C++) void semanticTypeInfoMembers(StructDeclaration sd)
{
if (sd.xeq &&
sd.xeq._scope &&
sd.xeq.semanticRun < PASS.semantic3done)
void runSemantic(ref FuncDeclaration fd, ref FuncDeclaration errFd)
{
uint errors = global.startGagging();
sd.xeq.semantic3(sd.xeq._scope);
if (global.endGagging(errors))
sd.xeq = sd.xerreq;
if (fd && fd._scope && fd.semanticRun < PASS.semantic3done)
{
const errors = global.startGagging();
fd.semantic3(fd._scope);
if (global.endGagging(errors))
fd = errFd;
}
}

if (sd.xcmp &&
sd.xcmp._scope &&
sd.xcmp.semanticRun < PASS.semantic3done)
{
uint errors = global.startGagging();
sd.xcmp.semantic3(sd.xcmp._scope);
if (global.endGagging(errors))
sd.xcmp = sd.xerrcmp;
}
runSemantic(sd.xeq, sd.xerreq);
runSemantic(sd.xcmp, sd.xerrcmp);

FuncDeclaration ftostr = search_toString(sd);
if (ftostr &&
Expand Down