Skip to content

Improve template specialisation selection (#1267) #1268

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve template specialisation selection (#1267) #1268

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
20 changes: 20 additions & 0 deletions ...lipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,26 @@ public void test14_5_4_1s2_MatchingTemplateSpecializations() throws Exception {
assertSame(R3.getTemplateDefinition(), A4);
}

// template <typename T> constexpr bool consume_r1() { return true; }
// template <class T1, bool EN = true> class A { };
// template <class T1> class A <T1, (bool)consume_r1<T1>()> { };
// A<int> a1; // uses specialisation
public void testPrimitiveMatchingSpecializations() throws Exception {
IASTTranslationUnit tu = parse(getAboveComment(), CPP);
NameCollector col = new NameCollector();
tu.accept(col);

ICPPClassTemplate A1 = (ICPPClassTemplate) col.getName(4).resolveBinding();
ICPPClassTemplate A2 = (ICPPClassTemplate) col.getName(6).resolveBinding();

assertTrue(A2 instanceof ICPPClassTemplatePartialSpecialization);
assertSame(((ICPPClassTemplatePartialSpecialization) A2).getPrimaryClassTemplate(), A1);

ICPPTemplateInstance R1 = (ICPPTemplateInstance) col.getName(12).resolveBinding();

assertSame(R1.getTemplateDefinition(), A2);
}

// template <class T> void f(T);
// template <class T> void f(T*);
// template <> void f(int); //ok
Expand Down
3 changes: 3 additions & 0 deletions ...ser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/TemplateArgumentDeduction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,6 +877,9 @@ private boolean fromTemplateArgument(ICPPTemplateArgument p, ICPPTemplateArgumen
}
}
IValue sval = a.getNonTypeValue();
tval = CPPTemplates.instantiateValue(tval, InstantiationContext.forDeduction(fDeducedArgs),
IntegralValue.MAX_RECURSION_DEPTH);

return tval.equals(sval);
}

Expand Down
Loading