Skip to content

Fix #17749 - Ignore failing overload candidates #23323

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

Open
0-v-0 wants to merge 1 commit into
base: master
Choose a base branch
from
+32 −4
Open

Fix #17749 - Ignore failing overload candidates #23323

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
26 changes: 22 additions & 4 deletions compiler/src/dmd/templatesem.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3713,9 +3713,17 @@ bool findBestMatch(TemplateInstance ti, Scope* sc, ArgumentList argumentList)
TemplateDeclaration td_best;
TemplateDeclaration td_ambig;
MATCH m_best = MATCH.nomatch;
uint candidateCount = 0;

Dsymbol dstart = tovers ? tovers.a[oi] : ti.tempdecl;
overloadApply(dstart, (Dsymbol s)
{
if (s.isTemplateDeclaration())
++candidateCount;
return 0;
});
const gagCandidates = candidateCount > 1;
overloadApply(dstart, (Dsymbol s)
{
auto td = s.isTemplateDeclaration();
if (!td)
Expand All @@ -3736,9 +3744,11 @@ bool findBestMatch(TemplateInstance ti, Scope* sc, ArgumentList argumentList)
dedtypes.zero();
assert(td.semanticRun != PASS.initial);

const olderrors = gagCandidates ? global.startGagging() : 0u;
MATCH m = matchWithInstance(sc, td, ti, dedtypes, argumentList, 0);
const errors = gagCandidates && global.endGagging(olderrors);
//printf("matchWithInstance = %d\n", m);
if (m == MATCH.nomatch) // no match at all
if (errors || m == MATCH.nomatch) // no match at all
return 0;
if (m < m_best) goto Ltd_best;
if (m > m_best) goto Ltd;
Expand Down Expand Up @@ -5511,9 +5521,17 @@ bool TemplateInstance_semanticTiargs(Loc loc, Scope* sc, Objects* tiargs, int fl
}
else
{
sc = sc.startCTFE();
ea = ea.expressionSemantic(sc);
sc = sc.endCTFE();
const mightBeAlias = ea.op == EXP.variable || !definitelyValueParameter(ea);
if (mightBeAlias)
{
ea = ea.expressionSemantic(sc);
}
else
{
sc = sc.startCTFE();
ea = ea.expressionSemantic(sc);
sc = sc.endCTFE();
}

if (auto varExp = ea.isVarExp())
{
Expand Down
10 changes: 10 additions & 0 deletions compiler/test/compilable/test15801.d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
enum foo(alias sym) = 3;

string str;

static assert(foo!str == 3);

enum bar(int n) = 2;
enum bar(alias sym) = 3;

static assert(bar!str == 3);
Loading