mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 02:06:01 +02:00
Code Issues Wiki Activity

Bug 487698 - Use fully simplified type during deduction (while still preserving typedefs in the result)

Browse source 
Change-Id: Ic2b7fbe62317660af218a722d2a113f5ab0d9b4b
This commit is contained in:
Nathan Ridge 2016-02-18 19:26:35 -05:00
parent 98bbc1597e
commit d5e518217a
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java
View file

@ -7854,6 +7854,30 @@ public class AST2TemplateTests extends AST2TestBase {
parseAndCheckBindings(); parseAndCheckBindings();
} }
// template<typename T>
// struct term_traits;
//
// template<typename T>
// struct term_traits<T const &> {
// typedef T value_type;
// };
//
// template<typename T, int N>
// struct term_traits<T const (&)[N]> {
// typedef T value_type[N];
// };
//
// using T = const char(&)[4];
// using ActualType = term_traits<T const &>::value_type;
//
// using ExpectedType = char[4];
public void testQualifierTypeThatCollapsesAfterTypedefSubstitution_487698() throws Exception {
BindingAssertionHelper helper = getAssertionHelper();
ITypedef actualType = helper.assertNonProblem("ActualType");
ITypedef expectedType = helper.assertNonProblem("ExpectedType");
assertSameType(actualType, expectedType);
}
// template <typename> // template <typename>
// struct meta { // struct meta {
// static const bool value = 1; // static const bool value = 1;

5
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/TemplateArgumentDeduction.java
View file

@ -840,8 +840,9 @@ public class TemplateArgumentDeduction {
} }
private boolean fromType(IType p, IType a, boolean allowCVQConversion, IASTNode point) throws DOMException { private boolean fromType(IType p, IType a, boolean allowCVQConversion, IASTNode point) throws DOMException {
IType originalArgType = a;
a = SemanticUtil.getSimplifiedType(a);
while (p != null) { while (p != null) {
IType argumentTypeBeforeTypedefResolution = a;
while (a instanceof ITypedef) while (a instanceof ITypedef)
a = ((ITypedef) a).getType(); a = ((ITypedef) a).getType();
while (p instanceof ITypedef) while (p instanceof ITypedef)
@ -945,7 +946,7 @@ public class TemplateArgumentDeduction {
if (a == null) if (a == null)
return false; return false;
return deduce(((ICPPTemplateParameter) p).getParameterID(), return deduce(((ICPPTemplateParameter) p).getParameterID(),
new CPPTemplateTypeArgument(a, argumentTypeBeforeTypedefResolution)); new CPPTemplateTypeArgument(a, ExpressionTypes.restoreTypedefs(a, originalArgType)));
} else if (p instanceof ICPPTemplateInstance) { } else if (p instanceof ICPPTemplateInstance) {
if (!(a instanceof ICPPTemplateInstance)) if (!(a instanceof ICPPTemplateInstance))
return false; return false;