Revert "Bug 395243 - Error involving dependent expressions"

This reverts commit f429bd5482.

core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java

@@ -6938,7 +6938,7 @@ public class AST2TemplateTests extends AST2BaseTest {
 	//	    static const int value = sizeof(waldo(f));
 	//	};
 	//	typedef identity<Int<S<>::value>>::type reference;
-	public void testDependentExpressions_395243() throws Exception {
+	public void _testDependentExpressions_395243() throws Exception {
 		parseAndCheckBindings();
 	}
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPDeferredFunction.java

@@ -8,11 +8,12 @@
  * Contributors:
  *     Markus Schorn - initial API and implementation
  *     Sergey Prigogin (Google)
- *     Nathan Ridge
  *******************************************************************************/ 
 package org.eclipse.cdt.internal.core.dom.parser.cpp;
 
+import org.eclipse.cdt.core.dom.ast.DOMException;
 import org.eclipse.cdt.core.dom.ast.IBinding;
+import org.eclipse.cdt.core.dom.ast.IFunction;
 import org.eclipse.cdt.core.dom.ast.IScope;
 import org.eclipse.cdt.core.dom.ast.IType;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPConstructor;
@@ -29,33 +30,19 @@ public class CPPDeferredFunction extends CPPUnknownBinding implements ICPPFuncti
 	private static final ICPPFunctionType FUNCTION_TYPE=
 			new CPPFunctionType(ProblemType.UNKNOWN_FOR_EXPRESSION, IType.EMPTY_TYPE_ARRAY);
 
-	/**
+	public static ICPPFunction createForSample(IFunction sample) throws DOMException {
-	 * Creates a CPPDeferredFunction given a set of overloaded functions
+		if (sample instanceof ICPPConstructor)
-	 * (some of which may be templates) that the function might resolve to.
+			return new CPPUnknownConstructor(((ICPPConstructor) sample).getClassOwner());
-	 * At least one candidate must be provided.
-	 * 
-	 * @param candidates a set of overloaded functions, some of which may be templates
-	 * @return the constructed CPPDeferredFunction
-	 */
-	public static ICPPFunction createForCandidates(ICPPFunction... candidates) {
-		if (candidates[0] instanceof ICPPConstructor)
-			return new CPPUnknownConstructor(((ICPPConstructor) candidates[0]).getClassOwner(), candidates);
 		
-		final IBinding owner = candidates[0].getOwner();
+		final IBinding owner = sample.getOwner();
-		return new CPPDeferredFunction(owner, candidates[0].getNameCharArray(), candidates);
+		return new CPPDeferredFunction(owner, sample.getNameCharArray());
 	}
 
 	private final IBinding fOwner;
-	private final ICPPFunction[] fCandidates;
 
-	public CPPDeferredFunction(IBinding owner, char[] name, ICPPFunction[] candidates) {
+	public CPPDeferredFunction(IBinding owner, char[] name) {
 		super(name);
 		fOwner= owner;
-		fCandidates = candidates;
-	}
-
-	public ICPPFunction[] getCandidates() {
-		return fCandidates;
 	}
 
 	@Override

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownConstructor.java

@@ -8,13 +8,11 @@
  * Contributors:
  *     Markus Schorn - initial API and implementation
  *     Thomas Corbat (IFS)
- *     Nathan Ridge
  *******************************************************************************/ 
 package org.eclipse.cdt.internal.core.dom.parser.cpp;
 
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPConstructor;
-import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunction;
 
 /**
  * Represents a reference to a constructor (instance), which cannot be resolved because 
@@ -23,11 +21,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunction;
 public class CPPUnknownConstructor extends CPPDeferredFunction implements ICPPConstructor {
 
 	public CPPUnknownConstructor(ICPPClassType owner) {
-		super(owner, owner.getNameCharArray(), null);
+		super(owner, owner.getNameCharArray());
-	}
-
-	public CPPUnknownConstructor(ICPPClassType owner, ICPPFunction[] candidates) {
-		super(owner, owner.getNameCharArray(), candidates);
 	}
 
 	@Override

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPFunctionSet.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2012 Wind River Systems, Inc. and others.
+ * Copyright (c) 2010 Wind River Systems, Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,7 +7,6 @@
  *
  * Contributors:
  *     Markus Schorn - initial API and implementation
- *     Nathan Ridge
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.dom.parser.cpp.semantics;
 
@@ -93,7 +92,7 @@ public class CPPFunctionSet implements ICPPTwoPhaseBinding {
 	
 	public void setToUnknown() {
 		if (fName != null) {
-			fName.setBinding(new CPPDeferredFunction(null, fName.toCharArray(), fBindings));
+			fName.setBinding(new CPPDeferredFunction(null, fName.toCharArray()));
 		}
 	}
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java

@@ -13,7 +13,6 @@
  *     Sergey Prigogin (Google)
  *     Mike Kucera (IBM)
  *     Thomas Corbat (IFS)
- *     Nathan Ridge
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.dom.parser.cpp.semantics;
 
@@ -452,7 +451,7 @@ public class CPPSemantics {
 		final ASTNodeProperty namePropertyInParent = name.getPropertyInParent();
 		if (binding == null && data.skippedScope != null) {
 			if (data.hasFunctionArguments()) {
-				binding= new CPPDeferredFunction(data.skippedScope, name.getSimpleID(), null);
+				binding= new CPPDeferredFunction(data.skippedScope, name.getSimpleID());
 			} else {
 				if (namePropertyInParent == IASTNamedTypeSpecifier.NAME) {
 					binding= new CPPUnknownMemberClass(data.skippedScope, name.getSimpleID());
@@ -2396,7 +2395,7 @@ public class CPPSemantics {
 			if (viableCount == 1)
 				return fns[0];
 			setTargetedFunctionsToUnknown(argTypes);
-			return CPPDeferredFunction.createForCandidates(fns);
+			return CPPDeferredFunction.createForSample(fns[0]);
 		}
 
 		IFunction[] ambiguousFunctions= null;   // ambiguity, 2 functions are equally good
@@ -2404,7 +2403,7 @@ public class CPPSemantics {
 
 		// Loop over all functions
 		List<FunctionCost> potentialCosts= null;
-		ICPPFunction unknownFunction= null;
+		IFunction unknownFunction= null;
 		final CPPASTTranslationUnit tu = data.getTranslationUnit();
 		for (ICPPFunction fn : fns) {
 			if (fn == null)
@@ -2456,7 +2455,7 @@ public class CPPSemantics {
 				return null;
 
 			setTargetedFunctionsToUnknown(argTypes);
-			return CPPDeferredFunction.createForCandidates(fns);
+			return CPPDeferredFunction.createForSample(unknownFunction);
 		}
 
 		if (ambiguousFunctions != null) {

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

@@ -11,7 +11,6 @@
  *     Markus Schorn (Wind River Systems)
  *     Sergey Prigogin (Google)
  *     Thomas Corbat (IFS)
- *     Nathan Ridge
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.dom.parser.cpp.semantics;
 
@@ -164,6 +163,7 @@ public class CPPTemplates {
 	static final int PACK_SIZE_DEFER = -1;
 	static final int PACK_SIZE_FAIL = -2;
 	static final int PACK_SIZE_NOT_FOUND = Integer.MAX_VALUE;
+	private static final ICPPFunction[] NO_FUNCTIONS = {};
 	static enum TypeSelection { PARAMETERS, RETURN_TYPE, PARAMETERS_AND_RETURN_TYPE }
 
 	/**
@@ -1726,12 +1726,18 @@ public class CPPTemplates {
 				requireTemplate= false;
 
 			if (func instanceof ICPPFunctionTemplate) {
+				ICPPFunctionTemplate template= (ICPPFunctionTemplate) func;
+				try {
 					if (containsDependentType(fnArgs))
-					return new ICPPFunction[] {CPPDeferredFunction.createForCandidates(fns)};
+						return new ICPPFunction[] {CPPDeferredFunction.createForSample(template)};
-
-				if (requireTemplate && hasDependentArgument(tmplArgs))
-					return new ICPPFunction[] {CPPDeferredFunction.createForCandidates(fns)};
 
+					if (requireTemplate) {
+						if (hasDependentArgument(tmplArgs))
+							return new ICPPFunction[] {CPPDeferredFunction.createForSample(template)};
+					}
+				} catch (DOMException e) {
+					return NO_FUNCTIONS;
+				}
 				haveTemplate= true;
 				break;
 			}
@@ -1797,11 +1803,15 @@ public class CPPTemplates {
 
 				// Extract template arguments and parameter types.
 				if (!checkedForDependentType) {
+					try {
 						if (isDependentType(conversionType)) {
-						inst= CPPDeferredFunction.createForCandidates(functions);
+							inst= CPPDeferredFunction.createForSample(template);
 							done= true;
 						}
 						checkedForDependentType= true;
+					} catch (DOMException e) {
+						return functions;
+					}
 				}
 				CPPTemplateParameterMap map= new CPPTemplateParameterMap(1);
 				try {
@@ -1859,7 +1869,7 @@ public class CPPTemplates {
 			ICPPTemplateArgument[] args, IASTNode point) {
 		try {
 			if (target != null && isDependentType(target)) {
-				return CPPDeferredFunction.createForCandidates(template);
+				return CPPDeferredFunction.createForSample(template);
 			}
 
 			if (template instanceof ICPPConstructor || args == null)

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java

@@ -145,7 +145,6 @@ public class EvalFunctionSet extends CPPEvaluation {
 			ICPPClassSpecialization within, int maxdepth, IASTNode point) {
 		ICPPTemplateArgument[] originalArguments = fFunctionSet.getTemplateArguments();
 		ICPPTemplateArgument[] arguments = originalArguments;
-		if (originalArguments != null)
 		arguments = instantiateArguments(originalArguments, tpMap, packOffset, within, point);
 
 		IBinding originalOwner = fFunctionSet.getOwner();

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java

@@ -8,7 +8,6 @@
  * Contributors:
  *     Markus Schorn - initial API and implementation
  *     Sergey Prigogin (Google)
- *     Nathan Ridge
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.dom.parser.cpp.semantics;
 
@@ -49,7 +48,6 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameterMap;
 import org.eclipse.cdt.internal.core.dom.parser.ISerializableEvaluation;
 import org.eclipse.cdt.internal.core.dom.parser.ITypeMarshalBuffer;
 import org.eclipse.cdt.internal.core.dom.parser.Value;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPDeferredFunction;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPEvaluation;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPUnknownBinding;
 import org.eclipse.core.runtime.CoreException;
@@ -186,24 +184,6 @@ public class EvalID extends CPPEvaluation {
 			return new EvalFunctionSet((CPPFunctionSet) binding, isAddressOf(expr));
 		}
 		if (binding instanceof ICPPUnknownBinding) {
-			ICPPTemplateArgument[] templateArgs = null;
-			final IASTName lastName = name.getLastName();
-			if (lastName instanceof ICPPASTTemplateId) {
-				try {
-					templateArgs= CPPTemplates.createTemplateArgumentArray((ICPPASTTemplateId) lastName);
-				} catch (DOMException e) {
-					return EvalFixed.INCOMPLETE;
-				}
-			}
-
-			if (binding instanceof CPPDeferredFunction) {
-				CPPDeferredFunction deferredFunction = (CPPDeferredFunction) binding;
-				if (deferredFunction.getCandidates() != null) {
-					CPPFunctionSet functionSet = new CPPFunctionSet(deferredFunction.getCandidates(), templateArgs, null);
-					return new EvalFunctionSet(functionSet, isAddressOf(expr));
-				}
-			}
-
 			IBinding owner = binding.getOwner();
 			if (owner instanceof IProblemBinding)
 				return EvalFixed.INCOMPLETE;
@@ -213,12 +193,21 @@ public class EvalID extends CPPEvaluation {
 			if (fieldOwnerType != null) {
 				fieldOwner= new EvalFixed(fieldOwnerType, ValueCategory.LVALUE, Value.UNKNOWN);
 			}
-
+			ICPPTemplateArgument[] templateArgs = null;
+			final IASTName lastName = name.getLastName();
+			if (lastName instanceof ICPPASTTemplateId) {
+				try {
+					templateArgs= CPPTemplates.createTemplateArgumentArray((ICPPASTTemplateId) lastName);
+				} catch (DOMException e) {
+					return EvalFixed.INCOMPLETE;
+				}
+			}
 			return new EvalID(fieldOwner, owner, name.getSimpleID(), isAddressOf(expr),
 					name instanceof ICPPASTQualifiedName, templateArgs);
 		}
-
+		/**
-		// 9.3.1-3 Transformation to class member access within a non-static member function.
+		 * 9.3.1-3 Transformation to class member access within a non-static member function.
+		 */
 		if (binding instanceof ICPPMember && !(binding instanceof IType)
 				&& !(binding instanceof ICPPConstructor) &&!((ICPPMember) binding).isStatic()) {
 			IType fieldOwnerType= withinNonStaticMethod(expr);