mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 10:16:03 +02:00
Code Issues Wiki Activity

Bug 402878. Do not instantiate all members when searching for a matching

Browse source 
one.
This commit is contained in:
Sergey Prigogin 2013-05-16 15:03:27 -07:00
parent 95073b1f13
commit ef19f9a8e6
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMemberBlock.java
View file

@ -15,6 +15,7 @@ package org.eclipse.cdt.internal.core.pdom.dom.cpp;
import org.eclipse.cdt.core.dom.IPDOMVisitor; import org.eclipse.cdt.core.dom.IPDOMVisitor;
import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IBinding;
import org.eclipse.cdt.internal.core.pdom.PDOM;
import org.eclipse.cdt.internal.core.pdom.db.Database; import org.eclipse.cdt.internal.core.pdom.db.Database;
import org.eclipse.cdt.internal.core.pdom.dom.PDOMLinkage; import org.eclipse.cdt.internal.core.pdom.dom.PDOMLinkage;
import org.eclipse.cdt.internal.core.pdom.dom.PDOMNode; import org.eclipse.cdt.internal.core.pdom.dom.PDOMNode;
@ -76,6 +77,10 @@ public class PDOMCPPMemberBlock {
return linkage.getDB(); return linkage.getDB();
} }
private PDOM getPDOM() {
return linkage.getPDOM();
}
public long getRecord() { public long getRecord() {
return record; return record;
} }
@ -96,6 +101,7 @@ public class PDOMCPPMemberBlock {
private static void addMember(PDOMCPPMemberBlock block, PDOMNode member, int visibility) private static void addMember(PDOMCPPMemberBlock block, PDOMNode member, int visibility)
throws CoreException { throws CoreException {
assert member.getPDOM() == block.getPDOM();
while (true) { while (true) {
int pos = block.getNextPosition(); int pos = block.getNextPosition();
if (pos < MAX_MEMBER_COUNT) { if (pos < MAX_MEMBER_COUNT) {
@ -150,16 +156,6 @@ public class PDOMCPPMemberBlock {
return record + MEMBER_POINTERS + Database.PTR_SIZE * memberIndex; return record + MEMBER_POINTERS + Database.PTR_SIZE * memberIndex;
} }
private PDOMNode getMember(int memberIndex) throws CoreException {
if (memberIndex < getNextPosition() && memberIndex < MAX_MEMBER_COUNT) {
long memberRecord = getMemberRecord(memberIndex);
if (memberRecord != 0) {
return linkage.getNode(memberRecord);
}
}
return null;
}
private void setVisibility(int memberIndex, int newVisibility) throws CoreException { private void setVisibility(int memberIndex, int newVisibility) throws CoreException {
newVisibility &= VISIBILITY_MASK; newVisibility &= VISIBILITY_MASK;
@ -182,12 +178,20 @@ public class PDOMCPPMemberBlock {
} }
private static int getVisibility(PDOMCPPMemberBlock block, IBinding member) throws CoreException { private static int getVisibility(PDOMCPPMemberBlock block, IBinding member) throws CoreException {
if (!(member instanceof PDOMNode))
return -1;
PDOMNode memberNode = (PDOMNode) member;
if (memberNode.getPDOM() != block.getPDOM())
return -1;
long memberRecord = memberNode.getRecord();
do { do {
for (int memberIndex = 0; memberIndex < block.getNextPosition(); memberIndex++) { for (int memberIndex = 0; memberIndex < MAX_MEMBER_COUNT; memberIndex++) {
PDOMNode candidate = block.getMember(memberIndex); long rec = block.getMemberRecord(memberIndex);
if (candidate == null) if (rec == 0)
return -1; return -1;
if (candidate.equals(member)) if (rec == memberRecord)
return block.getVisibility(memberIndex); return block.getVisibility(memberIndex);
} }
} while ((block = block.getNextBlock()) != null); } while ((block = block.getNextBlock()) != null);