diff options
author | Hannes Vogt | 2019-04-30 20:53:43 +0000 |
---|---|---|
committer | Nathan Ridge | 2019-05-05 22:54:25 +0000 |
commit | 665f47395e441584cc79fa1955a77ba1411f6665 (patch) | |
tree | b63515a5a72a039ab70c3b13d05d134744194ce3 | |
parent | 2006e6cdf1065f08c313d54f8ba27ce56136e48c (diff) | |
download | org.eclipse.cdt-665f47395e441584cc79fa1955a77ba1411f6665.tar.gz org.eclipse.cdt-665f47395e441584cc79fa1955a77ba1411f6665.tar.xz org.eclipse.cdt-665f47395e441584cc79fa1955a77ba1411f6665.zip |
Bug 546843 - Initialization from dependent argument
Create deferred functions for constructor calls with dependent
arguments.
Change-Id: I007dd4fd12c13acdcb39225b73051589f6dafad3
Signed-off-by: Hannes Vogt <hannes@havogt.de>
2 files changed, 48 insertions, 0 deletions
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java index 94c9023c58c..134cc592ab3 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java @@ -13101,4 +13101,38 @@ public class AST2CPPTests extends AST2CPPTestBase { BindingAssertionHelper bh = getAssertionHelper(); bh.assertImplicitName("foo", 3, IProblemBinding.class); } + + // class Time { + // }; + // + // template<class T> + // class Test { + // private: + // T t; + // public: + // void test() { + // Time time = t.get(); + // } + // }; + public void testCopyInitializationFromDependentType_546843() throws Exception { + parseAndCheckImplicitNameBindings(); + } + + // class Time { + // int a; + // }; + // + // template<class T> + // class Test { + // private: + // T t; + // public: + // void test() { + // Time time{t.get()}; + // } + // }; + public void testListInitializationFromDependentType_546843() throws Exception { + parseAndCheckImplicitNameBindings(); + } + } 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 e899187cc0d..2b20779a8fc 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 @@ -3726,6 +3726,11 @@ public class CPPSemantics { IType sourceType = evaluation.getType(); ValueCategory isLValue = evaluation.getValueCategory(); if (sourceType != null) { + if (CPPTemplates.isDependentType(sourceType)) { + IType[] tmp = { sourceType }; + setTargetedFunctionsToUnknown(tmp); + return CPPDeferredFunction.createForCandidates(type.getConstructors()); + } Cost c; if (calculateInheritanceDepth(sourceType, type) >= 0) { c = Conversions.copyInitializationOfClass(isLValue, sourceType, type, false); @@ -3747,6 +3752,15 @@ public class CPPSemantics { // List initialization. ICPPEvaluation eval = ((ICPPASTInitializerClause) initializer).getEvaluation(); if (eval instanceof EvalInitList) { + if (CPPTemplates.isDependentType(eval.getType())) { + ICPPEvaluation[] clauses = ((EvalInitList) eval).getClauses(); + IType[] tmp = new IType[clauses.length]; + for (int i = 0; i < clauses.length; i++) { + tmp[i] = clauses[i].getType(); + } + setTargetedFunctionsToUnknown(tmp); + return CPPDeferredFunction.createForCandidates(type.getConstructors()); + } Cost c = Conversions.listInitializationSequence((EvalInitList) eval, type, UDCMode.ALLOWED, true); if (c.converts()) { ICPPFunction f = c.getUserDefinedConversion(); |