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

Bug 430230. More involved test case and a fix for the issues it

Browse source 
uncovered.
This commit is contained in:
Sergey Prigogin 2014-03-13 20:39:01 -07:00
parent db4c3d2c3e
commit 450504e505
4 changed files with 73 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7430,7 +7430,57 @@ public class AST2TemplateTests extends AST2TestBase {
// int waldo(int p); // int waldo(int p);
// //
// int x = waldo(test<A>(0)); // int x = waldo(test<A>(0));
public void testSfinaeInNewExpression_430230() throws Exception { public void testSfinaeInNewExpression_430230a() throws Exception {
parseAndCheckBindings();
}
// template<bool __v>
// struct bool_constant {
// static constexpr bool value = __v;
// };
//
// typedef bool_constant<true> true_type;
// typedef bool_constant<false> false_type;
//
// struct B {
// template<typename T, typename Arg, typename = decltype(::new T(Arg()))>
// static true_type test(int);
//
// template<typename, typename>
// static false_type test(...);
// };
//
// template<typename T, typename Arg>
// struct C : public B {
// typedef decltype(test<T, Arg>(0)) type;
// };
//
// template<typename T, typename Arg>
// struct D : public C<T, Arg>::type {};
//
// template<typename T, typename Arg>
// struct E : public bool_constant<D<T, Arg>::value> {};
//
// template<bool, typename T = void>
// struct enable_if {};
//
// template<typename T>
// struct enable_if<true, T> {
// typedef T type;
// };
//
// struct A {};
//
// template <class F>
// typename enable_if<true>::type
// waldo();
//
// template <class F>
// typename enable_if<E<F, int>::value>::type
// waldo();
//
// auto x = waldo<A>;
public void testSfinaeInNewExpression_430230b() throws Exception {
parseAndCheckBindings(); parseAndCheckBindings();
} }

16
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPEvaluation.java
View file

@ -73,4 +73,20 @@ public abstract class CPPEvaluation implements ICPPEvaluation {
} }
return binding; return binding;
} }
public static boolean containsDependentType(ICPPEvaluation[] evaluations) {
for (ICPPEvaluation eval : evaluations) {
if (eval.isTypeDependent())
return true;
}
return false;
}
public static boolean containsDependentValue(ICPPEvaluation[] evaluations) {
for (ICPPEvaluation eval : evaluations) {
if (eval.isValueDependent())
return true;
}
return false;
}
} }

12
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalComma.java
View file

@ -65,20 +65,12 @@ public class EvalComma extends CPPDependentEvaluation {
if (fType != null) if (fType != null)
return fType instanceof TypeOfDependentExpression; return fType instanceof TypeOfDependentExpression;
for (ICPPEvaluation arg : fArguments) { return containsDependentType(fArguments);
if (arg.isTypeDependent())
return true;
}
return false;
} }
@Override @Override
public boolean isValueDependent() { public boolean isValueDependent() {
for (ICPPEvaluation arg : fArguments) { return containsDependentValue(fArguments);
if (arg.isValueDependent())
return true;
}
return false;
} }
public ICPPFunction[] getOverloads(IASTNode point) { public ICPPFunction[] getOverloads(IASTNode point) {

14
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java
View file

@ -93,7 +93,7 @@ public class EvalTypeId extends CPPDependentEvaluation {
} }
private IType computeType() { private IType computeType() {
if (CPPTemplates.isDependentType(fInputType)) if (CPPTemplates.isDependentType(fInputType) || containsDependentType(fArguments))
return new TypeOfDependentExpression(this); return new TypeOfDependentExpression(this);
IType type = typeFromReturnType(fInputType); IType type = typeFromReturnType(fInputType);
@ -186,14 +186,14 @@ public class EvalTypeId extends CPPDependentEvaluation {
if (args == fArguments && type == fInputType) if (args == fArguments && type == fInputType)
return this; return this;
if (!CPPTemplates.isDependentType(type) && !areArgumentTypesDependent() && type instanceof ICPPClassType) { if (!CPPTemplates.isDependentType(type) && !containsDependentType(args) && type instanceof ICPPClassType) {
// Check the constructor call and return EvalFixed.INCOMPLETE to indicate a substitution // Check the constructor call and return EvalFixed.INCOMPLETE to indicate a substitution
// failure if the call cannot be resolved. // failure if the call cannot be resolved.
ICPPClassType classType = (ICPPClassType) type; ICPPClassType classType = (ICPPClassType) type;
LookupData data = new LookupData(classType.getNameCharArray(), null, point); LookupData data = new LookupData(classType.getNameCharArray(), null, point);
ICPPConstructor[] constructors = ClassTypeHelper.getConstructors(classType, point); ICPPConstructor[] constructors = ClassTypeHelper.getConstructors(classType, point);
data.foundItems = constructors; data.foundItems = constructors;
data.setFunctionArguments(false, fArguments); data.setFunctionArguments(false, args);
try { try {
IBinding binding = CPPSemantics.resolveFunction(data, constructors, true); IBinding binding = CPPSemantics.resolveFunction(data, constructors, true);
if (binding == null || binding instanceof IProblemBinding || if (binding == null || binding instanceof IProblemBinding ||
@ -244,12 +244,4 @@ public class EvalTypeId extends CPPDependentEvaluation {
} }
return false; return false;
} }
private boolean areArgumentTypesDependent() {
for (ICPPEvaluation arg : fArguments) {
if (arg.isTypeDependent())
return true;
}
return false;
}
} }