Consider variable templates while determining size of parameter pack

eclipse-cdt · Mar 16, 2023 · 4b4daec · 4b4daec
1 parent 65ac74f
commit 4b4daec
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/....cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java b/....cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java
@@ -1278,6 +1278,16 @@ static int determinePackSize(ICPPUnknownBinding binding, ICPPTemplateParameterMa
 				if (r < 0)
 					return r;
 			}
+		} else if (binding instanceof ICPPDeferredVariableInstance dvi) {
+			if (dvi.getTemplateDefinition() instanceof ICPPTemplateTemplateParameter) {
+				r = combinePackSize(r, determinePackSize((ICPPUnknownBinding) dvi.getTemplateDefinition(), tpMap));
+			}
+			ICPPTemplateArgument[] args = dvi.getTemplateArguments();
+			for (ICPPTemplateArgument arg : args) {
+				r = combinePackSize(r, determinePackSize(arg, tpMap));
+				if (r < 0)
+					return r;
+			}
 		}
 		IBinding ownerBinding = binding.getOwner();
 		if (ownerBinding instanceof IType)