mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug 315528 - Non-virtual destructor diagnostics doesn't take superclass into account. Fixed false negatives when dtor is not public and there are no friends.

Browse source
This commit is contained in:
Sergey Prigogin 2011-05-20 17:41:15 +00:00
parent 2305812d98
commit 367325b8b3
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/NonVirtualDestructor.java
View file

@ -21,6 +21,7 @@ import org.eclipse.cdt.core.dom.ast.IASTNode;
import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IBinding;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTVisibilityLabel;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPBase; import org.eclipse.cdt.core.dom.ast.cpp.ICPPBase;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod; import org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod;
@ -89,14 +90,14 @@ public class NonVirtualDestructor extends AbstractIndexAstChecker {
binding = className.resolveBinding(); binding = className.resolveBinding();
} }
if (binding instanceof ICPPClassType) { if (binding instanceof ICPPClassType) {
ICPPClassType type = (ICPPClassType) binding; ICPPClassType classType = (ICPPClassType) binding;
virMethodName = null; virMethodName = null;
destructorName = null; destructorName = null;
// check for the following conditions: // check for the following conditions:
// class has own virtual method and own non-virtual destructor // class has own virtual method and own non-virtual destructor
// class has own virtual method and base non-virtual destructor // class has own virtual method and base non-virtual destructor
// class has base virtual method and own non-virtual destructor // class has base virtual method and own non-virtual destructor
ICPPMethod[] declaredMethods = type.getDeclaredMethods(); ICPPMethod[] declaredMethods = classType.getDeclaredMethods();
boolean hasOwnVirtualMethod = false; boolean hasOwnVirtualMethod = false;
boolean hasOwnNonVirDestructor = false; boolean hasOwnNonVirDestructor = false;
boolean hasDestructor = false; boolean hasDestructor = false;
@ -115,18 +116,25 @@ public class NonVirtualDestructor extends AbstractIndexAstChecker {
} }
} }
} }
boolean hasVirDestructor = false; boolean hasVirtualDestructor = false;
// Class has own virtual method and own non-virtual destructor. // Class has own virtual method and own non-virtual destructor.
if (hasOwnVirtualMethod && hasOwnNonVirDestructor) { if (hasOwnVirtualMethod && hasOwnNonVirDestructor) {
if (destructorName instanceof ICPPMethod) {
// Check if dtor is public or is accessible by friends.
if (((ICPPMethod) destructorName).getVisibility() != ICPPASTVisibilityLabel.v_public &&
classType.getFriends().length == 0) {
return false;
}
}
// Check if one of its base classes has a virtual destructor. // Check if one of its base classes has a virtual destructor.
return !hasVirtualDtorInBaseClass(type); return !hasVirtualDtorInBaseClass(classType);
} }
// Class does not have virtual methods but has virtual destructor // Class does not have virtual methods but has virtual destructor
// - not an error // - not an error
if (!hasOwnVirtualMethod && hasDestructor && !hasOwnNonVirDestructor) { if (!hasOwnVirtualMethod && hasDestructor && !hasOwnNonVirDestructor) {
return false; return false;
} }
ICPPMethod[] allDeclaredMethods = type.getAllDeclaredMethods(); ICPPMethod[] allDeclaredMethods = classType.getAllDeclaredMethods();
for (int i = 0; i < allDeclaredMethods.length; i++) { for (int i = 0; i < allDeclaredMethods.length; i++) {
ICPPMethod icppMethod = allDeclaredMethods[i]; ICPPMethod icppMethod = allDeclaredMethods[i];
if (icppMethod.isVirtual() && !icppMethod.isDestructor()) { if (icppMethod.isVirtual() && !icppMethod.isDestructor()) {
@ -137,7 +145,7 @@ public class NonVirtualDestructor extends AbstractIndexAstChecker {
if (icppMethod.isDestructor()) { if (icppMethod.isDestructor()) {
hasDestructor = true; hasDestructor = true;
if (icppMethod.isVirtual()) { if (icppMethod.isVirtual()) {
hasVirDestructor = true; hasVirtualDestructor = true;
} else { } else {
if (destructorName == null) if (destructorName == null)
destructorName = icppMethod; destructorName = icppMethod;
@ -146,7 +154,7 @@ public class NonVirtualDestructor extends AbstractIndexAstChecker {
} }
if (hasOwnVirtualMethod) { if (hasOwnVirtualMethod) {
// Class has own virtual method and base non-virtual destructor. // Class has own virtual method and base non-virtual destructor.
if (hasDestructor && !hasVirDestructor) { if (hasDestructor && !hasVirtualDestructor) {
return true; return true;
} }
} else if (hasVirtualMethod) { } else if (hasVirtualMethod) {