diff options
3 files changed, 17 insertions, 2 deletions
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java index e07b132667a..868304db03e 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java @@ -6897,7 +6897,7 @@ public class AST2TemplateTests extends AST2BaseTest { // struct Cat {}; // typedef S<is_convertible<Cat>::value>::type T; public void testDependentExpressionInvolvingField_388623() throws Exception { - parseAndCheckBindings(getAboveComment(), CPP, true); + parseAndCheckBindings(); } // struct S { @@ -6911,4 +6911,16 @@ public class AST2TemplateTests extends AST2BaseTest { public void testSFINAEInDefaultArgument() throws Exception { parseAndCheckBindings(); } + + // template <typename> + // struct M { + // template <typename... Args> + // M(Args...); + // }; + // void foo() { + // new M<int>((int*)0, 0); + // } + public void testVariadicConstructor_395247() throws Exception { + parseAndCheckBindings(); + } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java index dec5a062f90..eeb245d2399 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java @@ -417,6 +417,9 @@ public class CPPSemantics { if (cls instanceof ICPPUnknownBinding) { binding= new CPPUnknownConstructor(cls); } else { + // Do not interpret template arguments to a template class as being + // explicit template arguments to its templated constructor. + data.fTemplateArguments = null; binding= CPPSemantics.resolveFunction(data, ClassTypeHelper.getConstructors(cls, lookupPoint), true); } } catch (DOMException e) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/LookupData.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/LookupData.java index bb4677269e0..eb52bce8ca3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/LookupData.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/LookupData.java @@ -79,7 +79,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPEvaluation; * Context data for IASTName lookup */ public class LookupData extends ScopeLookupData { - final public ICPPTemplateArgument[] fTemplateArguments; + public ICPPTemplateArgument[] fTemplateArguments; public Map<ICPPNamespaceScope, List<ICPPNamespaceScope>> usingDirectives= Collections.emptyMap(); /** Used to ensure we don't visit things more than once. */ |