commit ae66e6d87b54fd911641b1a7df133a46c78b984b Author: David Malcolm dmalcolm@redhat.com Date: Fri Sep 2 15:41:49 2011 -0400

cpychecker: implement PyTuple_New

libcpychecker/refcounts.py | 8 +++ .../refcounts/PyTuple_New/correct/input.c | 49 ++++++++++++++++++++ .../refcounts/PyTuple_New/correct/script.py | 22 +++++++++ .../refcounts/PyTuple_New/correct/stdout.txt | 43 +++++++++++++++++ 4 files changed, 122 insertions(+), 0 deletions(-) --- diff --git a/libcpychecker/refcounts.py b/libcpychecker/refcounts.py index 343d233..8c120ea 100644 --- a/libcpychecker/refcounts.py +++ b/libcpychecker/refcounts.py @@ -1105,6 +1105,14 @@ class MyState(State): return [t_success, t_failure]

######################################################################## + # PyTuple_* + ######################################################################## + def impl_PyTuple_New(self, stmt): + newobj, t_success, t_failure = self.impl_object_ctor(stmt, + 'PyTupleObject', 'PyTuple_Type') + return [t_success, t_failure] + + ######################################################################## # (end of Python API implementations) ########################################################################

diff --git a/tests/cpychecker/refcounts/PyTuple_New/correct/input.c b/tests/cpychecker/refcounts/PyTuple_New/correct/input.c new file mode 100644 index 0000000..bf2bada --- /dev/null +++ b/tests/cpychecker/refcounts/PyTuple_New/correct/input.c @@ -0,0 +1,49 @@ +/* + 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 PyTuple_New +*/ + +PyObject * +test(PyObject *self, PyObject *args) +{ + PyObject *tuple; + tuple = PyTuple_New(0); + if (!tuple) { + return NULL; + } + + /* "tuple" should now have an ob_refcnt of 1 */ + return tuple; +} +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/PyTuple_New/correct/script.py b/tests/cpychecker/refcounts/PyTuple_New/correct/script.py new file mode 100644 index 0000000..fdd5ba3 --- /dev/null +++ b/tests/cpychecker/refcounts/PyTuple_New/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/PyTuple_New/correct/stdout.txt b/tests/cpychecker/refcounts/PyTuple_New/correct/stdout.txt new file mode 100644 index 0000000..b957a57 --- /dev/null +++ b/tests/cpychecker/refcounts/PyTuple_New/correct/stdout.txt @@ -0,0 +1,43 @@ +Trace 0: + Transitions: + 'PyTuple_New() succeeds' + 'taking False path' + 'returning' + Return value: + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyTuple_New/correct/input.c', line=30), region=RegionOnHeap('PyTupleObject', gcc.Location(file='tests/cpychecker/refcounts/PyTuple_New/correct/input.c', line=30))) + str(): (struct PyObject *)&RegionOnHeap('PyTupleObject', gcc.Location(file='tests/cpychecker/refcounts/PyTuple_New/correct/input.c', line=30)) from tests/cpychecker/refcounts/PyTuple_New/correct/input.c:30 + r->ob_refcnt: refs: 1 + N where N >= 0 + r->ob_type: PointerToRegion(gcctype='struct PyTypeObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyTuple_New/correct/input.c', line=30), region=RegionForGlobal(gcc.VarDecl('PyTuple_Type'))) + 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/PyTuple_New/correct/input.c', line=27), 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/PyTuple_New/correct/input.c', line=27), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + Exception: + (struct PyObject *)0 from tests/cpychecker/refcounts/PyTuple_New/correct/input.c:28 + +Trace 1: + Transitions: + 'PyTuple_New() fails' + 'taking True path' + 'returning' + Return value: + repr(): ConcreteValue(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyTuple_New/correct/input.c', line=32), value=0) + str(): (struct PyObject *)0 from tests/cpychecker/refcounts/PyTuple_New/correct/input.c:32 + 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/PyTuple_New/correct/input.c', line=27), 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/PyTuple_New/correct/input.c', line=27), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + Exception: + RegionForGlobal(gcc.VarDecl('PyExc_MemoryError'))