commit c45370a9afa9f284af09163a62e6630a1e8525fe Author: David Malcolm dmalcolm@redhat.com Date: Fri Sep 2 17:30:38 2011 -0400

cpychecker: implement PyType_IsSubtype

libcpychecker/refcounts.py | 9 ++++ .../refcounts/PyType_IsSubtype/correct/input.c | 48 ++++++++++++++++++++ .../refcounts/PyType_IsSubtype/correct/script.py | 22 +++++++++ .../refcounts/PyType_IsSubtype/correct/stdout.txt | 47 +++++++++++++++++++ 4 files changed, 126 insertions(+), 0 deletions(-) --- diff --git a/libcpychecker/refcounts.py b/libcpychecker/refcounts.py index 0a8498b..bba1644 100644 --- a/libcpychecker/refcounts.py +++ b/libcpychecker/refcounts.py @@ -1226,6 +1226,15 @@ class MyState(State): ######################################################################## # PyType_* ######################################################################## + def impl_PyType_IsSubtype(self, stmt): + # http://docs.python.org/dev/c-api/type.html#PyType_IsSubtype + args = self.eval_stmt_args(stmt) + v_a, v_b = args + returntype = stmt.fn.type.dereference.type + return [self.mktrans_assignment(stmt.lhs, + UnknownValue(returntype, stmt.loc), + None)] + def impl_PyType_Ready(self, stmt): # http://docs.python.org/dev/c-api/type.html#PyType_Ready args = self.eval_stmt_args(stmt) diff --git a/tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c b/tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c new file mode 100644 index 0000000..0e21964 --- /dev/null +++ b/tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c @@ -0,0 +1,48 @@ +/* + Copyright 2011 David Malcolm dmalcolm@redhat.com + Copyright 2011 Red Hat, Inc. + + This is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see + http://www.gnu.org/licenses/. +*/ + +#include <Python.h> + +/* + Test of correct reference-handling in a call to PyType_IsSubtype +*/ + +extern PyTypeObject some_type; + +PyObject * +test(PyObject *self, PyObject *args) +{ + /* + PyObject_TypeCheck is a macro, which can call PyType_IsSubtype if + the pointers aren't equal + */ + return PyBool_FromLong(PyObject_TypeCheck(self, &some_type)); +} +static PyMethodDef test_methods[] = { + {"test_method", test, METH_VARARGS, NULL}, + {NULL, NULL, 0, NULL} /* Sentinel */ +}; + +/* + PEP-7 +Local variables: +c-basic-offset: 4 +indent-tabs-mode: nil +End: +*/ diff --git a/tests/cpychecker/refcounts/PyType_IsSubtype/correct/script.py b/tests/cpychecker/refcounts/PyType_IsSubtype/correct/script.py new file mode 100644 index 0000000..fdd5ba3 --- /dev/null +++ b/tests/cpychecker/refcounts/PyType_IsSubtype/correct/script.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2011 David Malcolm dmalcolm@redhat.com +# Copyright 2011 Red Hat, Inc. +# +# This is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see +# http://www.gnu.org/licenses/. + +from libcpychecker import main +main(verify_refcounting=True, + dump_traces=True, + show_traces=False) diff --git a/tests/cpychecker/refcounts/PyType_IsSubtype/correct/stdout.txt b/tests/cpychecker/refcounts/PyType_IsSubtype/correct/stdout.txt new file mode 100644 index 0000000..03234d3 --- /dev/null +++ b/tests/cpychecker/refcounts/PyType_IsSubtype/correct/stdout.txt @@ -0,0 +1,47 @@ +Trace 0: + Transitions: + 'taking False path' + 'taking True path' + 'PyBool_FromLong() returns' + 'returning' + Return value: + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=35), region=RegionOnHeap('PyBool_FromLong', gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=35))) + str(): (struct PyObject *)&RegionOnHeap('PyBool_FromLong', gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=35)) from tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c:35 + r->ob_refcnt: refs: 1 + N where N >= 0 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=35), region=Region('PyTypeObject for PyBool_FromLong')) + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=29), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=29), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + Exception: + (struct PyObject *)0 from tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c:30 + +Trace 1: + Transitions: + 'taking False path' + 'taking False path' + 'PyBool_FromLong() returns' + 'returning' + Return value: + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=35), region=RegionOnHeap('PyBool_FromLong', gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=35))) + str(): (struct PyObject *)&RegionOnHeap('PyBool_FromLong', gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=35)) from tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c:35 + r->ob_refcnt: refs: 1 + N where N >= 0 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=35), region=Region('PyTypeObject for PyBool_FromLong')) + Region("region-for-arg-gcc.ParmDecl('self')"): + repr(): Region("region-for-arg-gcc.ParmDecl('self')") + str(): Region("region-for-arg-gcc.ParmDecl('self')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=29), region=Region("region-for-type-of-arg-gcc.ParmDecl('self')")) + Region("region-for-arg-gcc.ParmDecl('args')"): + repr(): Region("region-for-arg-gcc.ParmDecl('args')") + str(): Region("region-for-arg-gcc.ParmDecl('args')") + r->ob_refcnt: refs: 0 + N where N >= 1 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c', line=29), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + Exception: + (struct PyObject *)0 from tests/cpychecker/refcounts/PyType_IsSubtype/correct/input.c:30