commit 35ca44de6ec66a2276543743ae9c78645be55fd7 Author: David Malcolm dmalcolm@redhat.com Date: Fri Sep 2 14:47:07 2011 -0400

cpychecker: implement PyBool_FromLong

libcpychecker/refcounts.py | 14 ++++++ .../refcounts/PyBool_FromLong/correct/input.c | 44 ++++++++++++++++++++ .../refcounts/PyBool_FromLong/correct/script.py | 22 ++++++++++ .../refcounts/PyBool_FromLong/correct/stdout.txt | 21 +++++++++ 4 files changed, 101 insertions(+), 0 deletions(-) --- diff --git a/libcpychecker/refcounts.py b/libcpychecker/refcounts.py index 256dc17..68cae63 100644 --- a/libcpychecker/refcounts.py +++ b/libcpychecker/refcounts.py @@ -734,6 +734,20 @@ class MyState(State): return self._handle_PyArg_function(stmt, v_fmt, v_varargs, with_size_t=True)

######################################################################## + # PyBool_* + ######################################################################## + def impl_PyBool_FromLong(self, stmt): + # Declared in boolobject.h: + # PyAPI_FUNC(PyObject *) PyBool_FromLong(long); + # Defined in Objects/boolobject.c + # + # Always succeeds, returning a new ref to one of the two singleton + # booleans + # v_ok = self.eval_stmt_args(stmt)[0] + s_success, r_nonnull = self.mkstate_new_ref(stmt, 'PyBool_FromLong') + return [self.mktrans_from_fncall_state(stmt, s_success, 'returns')] + + ######################################################################## # PyDict_* ######################################################################## def impl_PyDict_GetItemString(self, stmt): diff --git a/tests/cpychecker/refcounts/PyBool_FromLong/correct/input.c b/tests/cpychecker/refcounts/PyBool_FromLong/correct/input.c new file mode 100644 index 0000000..396539d --- /dev/null +++ b/tests/cpychecker/refcounts/PyBool_FromLong/correct/input.c @@ -0,0 +1,44 @@ +/* + 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 PyBool_FromLong +*/ +extern long some_global; + +PyObject * +test(PyObject *self, PyObject *args) +{ + return PyBool_FromLong(some_global); +} + +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/PyBool_FromLong/correct/script.py b/tests/cpychecker/refcounts/PyBool_FromLong/correct/script.py new file mode 100644 index 0000000..fdd5ba3 --- /dev/null +++ b/tests/cpychecker/refcounts/PyBool_FromLong/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/PyBool_FromLong/correct/stdout.txt b/tests/cpychecker/refcounts/PyBool_FromLong/correct/stdout.txt new file mode 100644 index 0000000..1cbb4e8 --- /dev/null +++ b/tests/cpychecker/refcounts/PyBool_FromLong/correct/stdout.txt @@ -0,0 +1,21 @@ +Trace 0: + Transitions: + 'PyBool_FromLong() returns' + 'returning' + Return value: + repr(): PointerToRegion(gcctype='struct PyObject *', loc=gcc.Location(file='tests/cpychecker/refcounts/PyBool_FromLong/correct/input.c', line=30), region=RegionOnHeap('PyBool_FromLong', gcc.Location(file='tests/cpychecker/refcounts/PyBool_FromLong/correct/input.c', line=30))) + str(): (struct PyObject *)&RegionOnHeap('PyBool_FromLong', gcc.Location(file='tests/cpychecker/refcounts/PyBool_FromLong/correct/input.c', line=30)) from tests/cpychecker/refcounts/PyBool_FromLong/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/PyBool_FromLong/correct/input.c', line=30), 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/PyBool_FromLong/correct/input.c', line=28), 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/PyBool_FromLong/correct/input.c', line=28), region=Region("region-for-type-of-arg-gcc.ParmDecl('args')")) + Exception: + (struct PyObject *)0 from tests/cpychecker/refcounts/PyBool_FromLong/correct/input.c:29