mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Fixed an "Unsafe method call" exception.

Browse source
This commit is contained in:
Sergey Prigogin 2014-03-25 15:32:42 -07:00
parent 698788ea71
commit fa7aff1975
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/AccessContext.java
View file

@ -14,6 +14,7 @@ package org.eclipse.cdt.internal.core.dom.parser.cpp.semantics;
import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.DOMException;
import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.dom.ast.IASTNode;
import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IBinding;
import org.eclipse.cdt.core.dom.ast.ICompositeType; import org.eclipse.cdt.core.dom.ast.ICompositeType;
import org.eclipse.cdt.core.dom.ast.IProblemBinding; import org.eclipse.cdt.core.dom.ast.IProblemBinding;
@ -262,7 +263,8 @@ public class AccessContext {
ICPPClassType classType = firstCandidateForNamingClass; ICPPClassType classType = firstCandidateForNamingClass;
if (classType != null && isUnqualifiedLookup) { if (classType != null && isUnqualifiedLookup) {
IBinding owner = classType.getOwner(); IBinding owner = classType.getOwner();
while (owner instanceof ICPPClassType && !derivesFrom(classType, accessOwner, CPPSemantics.MAX_INHERITANCE_DEPTH)) { while (owner instanceof ICPPClassType &&
!derivesFrom(classType, accessOwner, name, CPPSemantics.MAX_INHERITANCE_DEPTH)) {
classType= (ICPPClassType) owner; classType= (ICPPClassType) owner;
owner= classType.getOwner(); owner= classType.getOwner();
} }
@ -270,19 +272,20 @@ public class AccessContext {
return classType; return classType;
} }
private static boolean derivesFrom(ICPPClassType derived, ICPPClassType target, int maxdepth) { private static boolean derivesFrom(ICPPClassType derived, ICPPClassType target, IASTNode point,
int maxdepth) {
if (derived == target || derived.isSameType(target)) { if (derived == target || derived.isSameType(target)) {
return true; return true;
} }
if (maxdepth > 0) { if (maxdepth > 0) {
for (ICPPBase cppBase : derived.getBases()) { for (ICPPBase cppBase : ClassTypeHelper.getBases(derived, point)) {
IBinding base= cppBase.getBaseClass(); IBinding base= cppBase.getBaseClass();
if (base instanceof ICPPClassType) { if (base instanceof ICPPClassType) {
ICPPClassType tbase= (ICPPClassType) base; ICPPClassType tbase= (ICPPClassType) base;
if (tbase.isSameType(target)) { if (tbase.isSameType(target)) {
return true; return true;
} }
if (derivesFrom(tbase, target, maxdepth - 1)) if (derivesFrom(tbase, target, point, maxdepth - 1))
return true; return true;
} }
} }