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 458850 - Fix false positive for deferred classes

Browse source 
Change-Id: I46335a94d69ae8d4e5ae1c68857344d1dc513328
Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
This commit is contained in:
Marco Stornelli 2019-04-27 17:55:37 +02:00
parent 125721a485
commit 695de049db
3 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
codan/org.eclipse.cdt.codan.checkers/plugin.xml
View file

@ -33,7 +33,7 @@
</checker> </checker>
<checker <checker
class="org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructor" class="org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorChecker"
id="org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructor" id="org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructor"
name="%checker.name.NonVirtualDestructor"> name="%checker.name.NonVirtualDestructor">
<problem <problem

11
codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/NonVirtualDestructor.java → codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/NonVirtualDestructorChecker.java
View file

@ -31,6 +31,7 @@ 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;
import org.eclipse.cdt.internal.core.dom.parser.cpp.ClassTypeHelper; import org.eclipse.cdt.internal.core.dom.parser.cpp.ClassTypeHelper;
import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPDeferredClassInstance;
import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding;
import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics;
@ -39,7 +40,8 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics;
* *
* @author Alena Laskavaia * @author Alena Laskavaia
*/ */
public class NonVirtualDestructor extends AbstractIndexAstChecker { @SuppressWarnings("restriction")
public class NonVirtualDestructorChecker extends AbstractIndexAstChecker {
public static final String PROBLEM_ID = "org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem"; //$NON-NLS-1$ public static final String PROBLEM_ID = "org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem"; //$NON-NLS-1$
// Prevent stack overflow in case: class A: public A {}; // Prevent stack overflow in case: class A: public A {};
@ -52,7 +54,12 @@ public class NonVirtualDestructor extends AbstractIndexAstChecker {
} }
private static ICPPMethod getDestructor(ICPPClassType classType) { private static ICPPMethod getDestructor(ICPPClassType classType) {
for (ICPPMethod method : classType.getDeclaredMethods()) { ICPPMethod[] methods = null;
if (classType instanceof ICPPDeferredClassInstance)
methods = ((ICPPDeferredClassInstance) classType).getClassTemplate().getDeclaredMethods();
else
methods = classType.getDeclaredMethods();
for (ICPPMethod method : methods) {
if (method.isDestructor()) { if (method.isDestructor()) {
return method; return method;
} }

23
codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/NonVirtualDestructorCheckerTest.java
View file

@ -16,11 +16,11 @@
package org.eclipse.cdt.codan.core.internal.checkers; package org.eclipse.cdt.codan.core.internal.checkers;
import org.eclipse.cdt.codan.core.tests.CheckerTestCase; import org.eclipse.cdt.codan.core.tests.CheckerTestCase;
import org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructor; import org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorChecker;
import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IMarker;
/** /**
* Test for {@link NonVirtualDestructor} class. * Test for {@link NonVirtualDestructorChecker} class.
*/ */
public class NonVirtualDestructorCheckerTest extends CheckerTestCase { public class NonVirtualDestructorCheckerTest extends CheckerTestCase {
@Override @Override
@ -31,7 +31,7 @@ public class NonVirtualDestructorCheckerTest extends CheckerTestCase {
@Override @Override
public void setUp() throws Exception { public void setUp() throws Exception {
super.setUp(); super.setUp();
enableProblems(NonVirtualDestructor.PROBLEM_ID); enableProblems(NonVirtualDestructorChecker.PROBLEM_ID);
} }
// struct A { // struct A {
@ -231,6 +231,21 @@ public class NonVirtualDestructorCheckerTest extends CheckerTestCase {
//} //}
public void testNestedClasses_Bug468749() throws Exception { public void testNestedClasses_Bug468749() throws Exception {
loadCodeAndRun(getAboveComment()); loadCodeAndRun(getAboveComment());
checkErrorLine(3, NonVirtualDestructor.PROBLEM_ID); checkErrorLine(3, NonVirtualDestructorChecker.PROBLEM_ID);
}
//template <typename T>
//class A {
// virtual void f() {}
//public:
// virtual ~A() {}
//};
//template <typename T>
//class B : public A<T> {
// virtual void f() {}
//};
public void testDeferredClasses_Bug458850() throws Exception {
loadCodeAndRun(getAboveComment());
checkNoErrors();
} }
} }