mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-21 21:52:10 +02:00
Code Issues Wiki Activity

Bug 540758 - Substitution of enclosing template parameters into expansion pattern

Browse source 
Change-Id: Ib31db579c7d5a9be2f64fe992abac48c0e2b136a
This commit is contained in:
Nathan Ridge 2018-11-22 00:29:26 -05:00
parent 1a8b9a9628
commit 9e44f3634a
3 changed files with 41 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10703,6 +10703,33 @@ public class AST2TemplateTests extends AST2CPPTestBase {
parseAndCheckBindings(); parseAndCheckBindings();
} }
// template<int Idx>
// struct get_from_variadic_pack {
// template<typename First, typename ... Accessors>
// static constexpr int apply(First first, Accessors... args) {
// return get_from_variadic_pack<Idx - 1>::apply(args...);
// }
// };
//
// template<>
// struct get_from_variadic_pack<0> {
// template<typename First, typename ... Accessors>
// static constexpr int apply(First first, Accessors ... args) {
// return first;
// }
// };
//
// template<int N>
// struct static_int{
// static constexpr int value = N;
// };
//
// constexpr int tmp = get_from_variadic_pack<1>::apply(1,2);
// constexpr int result = static_int<tmp>::value;
public void testInstantiationOfPackInNestedTemplate_540758() throws Exception {
parseAndCheckBindings();
}
// // A metafunction that loops infinitely on odd inputs. // // A metafunction that loops infinitely on odd inputs.
// template <int N> // template <int N>
// struct meta { // struct meta {

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPDependentEvaluation.java
View file

@ -124,7 +124,9 @@ public abstract class CPPDependentEvaluation extends CPPEvaluation {
if (packSize == CPPTemplates.PACK_SIZE_FAIL || packSize == CPPTemplates.PACK_SIZE_NOT_FOUND) { if (packSize == CPPTemplates.PACK_SIZE_FAIL || packSize == CPPTemplates.PACK_SIZE_NOT_FOUND) {
newEval = EvalFixed.INCOMPLETE; newEval = EvalFixed.INCOMPLETE;
} else if (packSize == CPPTemplates.PACK_SIZE_DEFER) { } else if (packSize == CPPTemplates.PACK_SIZE_DEFER) {
newEval = origEval; // We're not expanding the pack, but arguments for template parameters of
// enclosing templates may still need to be substituted into the expansion pattern.
newEval = origEval.instantiate(context, maxDepth);
} else { } else {
int shift = packSize - 1; int shift = packSize - 1;
ICPPEvaluation[] newResult = new ICPPEvaluation[subexpressions.length + resultShift + shift]; ICPPEvaluation[] newResult = new ICPPEvaluation[subexpressions.length + resultShift + shift];

13
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java
View file

@ -1334,7 +1334,9 @@ public class CPPTemplates {
IProblemBinding.SEMANTIC_INVALID_TYPE, IProblemBinding.SEMANTIC_INVALID_TYPE,
types[i] instanceof IBinding ? ((IBinding) types[i]).getNameCharArray() : null); types[i] instanceof IBinding ? ((IBinding) types[i]).getNameCharArray() : null);
} else if (packSize == PACK_SIZE_DEFER) { } else if (packSize == PACK_SIZE_DEFER) {
newType = origType; // We're not expanding the pack, but arguments for template parameters of
// enclosing templates may still need to be substituted into the expansion pattern.
newType = instantiateType(origType, context);
} else { } else {
IType[] newResult = new IType[result.length + packSize - 1]; IType[] newResult = new IType[result.length + packSize - 1];
System.arraycopy(result, 0, newResult, 0, j); System.arraycopy(result, 0, newResult, 0, j);
@ -1395,7 +1397,14 @@ public class CPPTemplates {
throw new DOMException(new ProblemBinding(CPPSemantics.getCurrentLookupPoint(), throw new DOMException(new ProblemBinding(CPPSemantics.getCurrentLookupPoint(),
IProblemBinding.SEMANTIC_INVALID_TEMPLATE_ARGUMENTS, null)); IProblemBinding.SEMANTIC_INVALID_TEMPLATE_ARGUMENTS, null));
} else if (packSize == PACK_SIZE_DEFER) { } else if (packSize == PACK_SIZE_DEFER) {
newArg = origArg; // We're not expanding the pack, but arguments for template parameters of
// enclosing templates may still need to be substituted into the expansion pattern.
newArg = instantiateArgument(origArg, context);
if (!isValidArgument(newArg)) {
if (strict)
return null;
newArg = origArg;
}
} else { } else {
int shift = packSize - 1; int shift = packSize - 1;
ICPPTemplateArgument[] newResult = new ICPPTemplateArgument[args.length + resultShift + shift]; ICPPTemplateArgument[] newResult = new ICPPTemplateArgument[args.length + resultShift + shift];