Attachment #155176 for bug #287907

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 609-615 Link Here

(-)parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java (-1 / +1 lines)
609		609
610	// template <class U1> class Test;	610	// template <class U1> class Test;
611	// template <class U2> void f();	611	// template <class U2> void f();
612	public void _test253080() throws Exception {	612	public void test253080() throws Exception {
613	waitForIndexer();	613	waitForIndexer();
614		614
615	String[] testData = getContentsForTest(3);	615	String[] testData = getContentsForTest(3);




import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateNonTypeParameter;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameter;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateTemplateParameter;
import org.eclipse.cdt.internal.core.Util;
import org.eclipse.cdt.internal.core.dom.parser.ProblemBinding;
import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInstanceCache;
import org.eclipse.cdt.internal.core.index.IIndexCPPBindingConstants;

	
	public PDOMCPPClassTemplate(PDOM pdom, PDOMNode parent, ICPPClassTemplate template)	throws CoreException {
		super(pdom, parent, template);
		try {
			ICPPTemplateParameter[] templateParameters = template.getTemplateParameters();
			PDOMCPPLinkage linkage = (PDOMCPPLinkage) getLinkageImpl();
			PDOMNodeLinkedList list = new PDOMNodeLinkedList(pdom, record + PARAMETERS, linkage);
			for (ICPPTemplateParameter parameter : templateParameters) {
				PDOMNode pdomParameter = linkage.createBinding(this, parameter);
				if (pdomParameter != null) {
					list.addMember(pdomParameter);
				}
			}
		} catch (DOMException e) {
			throw new CoreException(Util.createStatus(e));
		}
	}

	public PDOMCPPClassTemplate(PDOM pdom, int bindingRecord) {


	@Override
	public void addChild(PDOMNode member) throws CoreException {
		// Template parameters are added in ctor.
		if (!(member instanceof ICPPTemplateParameter)) {
			list.addMember(member);
		} else {
			super.addChild(member);
		}
	}




import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateArgument;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateInstance;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameter;
import org.eclipse.cdt.internal.core.Util;
import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInstanceCache;
import org.eclipse.cdt.internal.core.index.IIndexCPPBindingConstants;
import org.eclipse.cdt.internal.core.pdom.PDOM;

	public PDOMCPPFunctionTemplate(PDOM pdom, PDOMNode parent, ICPPFunctionTemplate template)
			throws CoreException {
		super(pdom, parent, (ICPPFunction) template, false);
		try {
			ICPPTemplateParameter[] templateParameters = template.getTemplateParameters();
			PDOMCPPLinkage linkage = (PDOMCPPLinkage) getLinkageImpl();
			PDOMNodeLinkedList list = new PDOMNodeLinkedList(pdom, record + TEMPLATE_PARAMS, linkage);
			for (ICPPTemplateParameter parameter : templateParameters) {
				PDOMNode pdomParameter = linkage.createBinding(this, parameter);
				if (pdomParameter != null) {
					list.addMember(pdomParameter);
				}
			}
		} catch (DOMException e) {
			throw new CoreException(Util.createStatus(e));
		}
	}

	public PDOMCPPFunctionTemplate(PDOM pdom, int bindingRecord) {


	@Override
	public void addChild(PDOMNode member) throws CoreException {
		// Template parameters are added in ctor.
			PDOMNodeLinkedList list = new PDOMNodeLinkedList(pdom, record + TEMPLATE_PARAMS, getLinkageImpl());
			list.addMember(member);
		} 
	}

	@Override

Lines 30-35 Link Here

(-)parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMFile.java (-1 / +2 lines)
30	import org.eclipse.cdt.core.dom.ast.IBinding;	30	import org.eclipse.cdt.core.dom.ast.IBinding;
31	import org.eclipse.cdt.core.dom.ast.IMacroBinding;	31	import org.eclipse.cdt.core.dom.ast.IMacroBinding;
32	import org.eclipse.cdt.core.dom.ast.IParameter;	32	import org.eclipse.cdt.core.dom.ast.IParameter;
		33	import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameter;
33	import org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDirective;	34	import org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDirective;
34	import org.eclipse.cdt.core.index.IIndexFileLocation;	35	import org.eclipse.cdt.core.index.IIndexFileLocation;
35	import org.eclipse.cdt.core.index.IIndexInclude;	36	import org.eclipse.cdt.core.index.IIndexInclude;
Lines 305-311 Link Here
305		306
306	private IIndexFragmentName createPDOMName(PDOMLinkage linkage, IASTName name, PDOMName caller) {	307	private IIndexFragmentName createPDOMName(PDOMLinkage linkage, IASTName name, PDOMName caller) {
307	final IBinding binding = name.getBinding();	308	final IBinding binding = name.getBinding();
308	if (binding instanceof IParameter) {	309	if (binding instanceof IParameter \|\| binding instanceof ICPPTemplateParameter) {
309	return null;	310	return null;
310	}	311	}
311	try {	312	try {

Return to bug 287907