Bug 356268 - Name resolution problem with 'using' declaration inside a

class. Fix and test case.

2 files changed, 52 insertions, 41 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 013c8924b4a..9bc859802fc 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
@@ -9480,15 +9480,36 @@ public class AST2CPPTests extends AST2BaseTest {
 	public void testAmbiguityResolution_Bug354599() throws Exception {
 		parseAndCheckBindings();
 	}
-	
+
+	//	struct A {
+	//	  void method(A);
+	//	};
+	//
+	//	struct B : A {
+	//	  void method(B);
+	//	  using A::method;
+	//	};
+	//
+	//	struct C : B {
+	//	};
+	//
+	//	void test() {
+	//	  B b;
+	//	  C c;
+	//	  c.method(b);
+	//	}
+	public void testAmbiguityResolution_Bug356268() throws Exception {
+		parseAndCheckBindings();
+	}
+
 	//	void (g)(char);
-	//	void (g )(int);
-	//	void (g  )(int);
+	//	void (g)(int); //1
+	//	void (g)(int); //2
 	public void testFunctionRedeclarations() throws Exception {
 		BindingAssertionHelper bh= getAssertionHelper();
-		IFunction g1= bh.assertNonProblem("g)", 1); 
-		IFunction g2= bh.assertNonProblem("g )", 1); 
-		IFunction g3= bh.assertNonProblem("g  )", 1);
+		IFunction g1= bh.assertNonProblem("g)(char)", 1); 
+		IFunction g2= bh.assertNonProblem("g)(int); //1", 1); 
+		IFunction g3= bh.assertNonProblem("g)(int); //2", 1);
 		assertNotSame(g1, g2);
 		assertSame(g2, g3);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/BaseClassLookup.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/BaseClassLookup.java
index 640c3594fb2..82ffa89a563 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/BaseClassLookup.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/BaseClassLookup.java
@@ -22,7 +22,6 @@ import org.eclipse.cdt.core.dom.ast.DOMException;
 import org.eclipse.cdt.core.dom.ast.IBinding;
 import org.eclipse.cdt.core.dom.ast.IProblemBinding;
 import org.eclipse.cdt.core.dom.ast.IScope;
-import org.eclipse.cdt.core.dom.ast.IType;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPBase;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassScope;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType;
@@ -56,8 +55,13 @@ class BaseClassLookup {
 			rootInfo.collectResultForContentAssist(data);
 		} else {
 			hideVirtualBases(rootInfo, infoMap);
-			IBinding[] result= rootInfo.collectResult(data, true, null);
-			verifyResult(data, result);
+			IBinding[] result= rootInfo.collectResult(data, true, IBinding.EMPTY_BINDING_ARRAY);
+			if (data.problem == null) {
+				data.foundItems = ArrayUtil.addAll((Object[]) data.foundItems, result);
+			} else if (result.length > 0) {
+				data.problem.setCandidateBindings(result);
+			}
+//			verifyResult(data, result);
 		}
 	}
 
@@ -323,7 +327,7 @@ class BaseClassLookup {
 		}
 	}
 
-	public IBinding[] collectResult(LookupData data, boolean asVirtualBase, IBinding[] result) {
+	private IBinding[] collectResult(LookupData data, boolean asVirtualBase, IBinding[] result) {
 		if (asVirtualBase) {
 			if (fHiddenAsVirtualBase)
 				return result;
@@ -337,41 +341,27 @@ class BaseClassLookup {
 		if (fCollected)
 			return result;
 		fCollected= true;
-		
-		result= (IBinding[]) ArrayUtil.addAll(IBinding.class, result, fBindings);
+
+		int numBindingsToAdd = 0;
+		for (int i = 0; i < fBindings.length; i++) {
+			IBinding binding = fBindings[i];
+			if (binding == null)
+				break;
+			if (!ArrayUtil.contains(result, binding))
+				fBindings[numBindingsToAdd++] = binding;
+		}
+		if (numBindingsToAdd < fBindings.length)
+			fBindings[numBindingsToAdd] = null;
+		if (result.length > 0 && numBindingsToAdd > 0 && data.problem == null) {
+			// Matches are found in more than one base class - this is an indication of ambiguity.
+			data.problem= new ProblemBinding(data.astName,
+					IProblemBinding.SEMANTIC_AMBIGUOUS_LOOKUP, result);
+		}
+		result= ArrayUtil.addAll(result, fBindings);
 		for (int i= 0; i < fChildren.size(); i++) {
 			BaseClassLookup child = fChildren.get(i);
 			result= child.collectResult(data, fVirtual.get(i), result);
 		}
 		return result;
 	}
-	
-	static void verifyResult(LookupData data, IBinding[] bindings) {
-		bindings= (IBinding[]) ArrayUtil.trim(IBinding.class, bindings);
-		if (bindings.length == 0)
-			return;
-		
-		if (data.problem != null) {
-			data.problem.setCandidateBindings(bindings);
-		} else {
-			ICPPClassType uniqueOwner= null;
-			for (IBinding b : bindings) {
-				if (!(b instanceof IType)) {
-					IBinding owner= b.getOwner();
-					if (owner instanceof ICPPClassType) {
-						final ICPPClassType classOwner = (ICPPClassType) owner;
-						if (uniqueOwner == null) {
-							uniqueOwner= classOwner;
-						} else if (!uniqueOwner.isSameType(classOwner)) {
-							data.problem= new ProblemBinding(data.astName,
-									IProblemBinding.SEMANTIC_AMBIGUOUS_LOOKUP, bindings);
-							return;
-						}
-					}
-				}
-			}
-		}
-
-		data.foundItems = ArrayUtil.addAll(Object.class, (Object[]) data.foundItems, bindings);
-	}
 }
\ No newline at end of file