Mercurial > cpython-lru_cache-weakref
annotate Objects/codeobject.c @ 43672:8fe24e5eeeff
Fix a refleak for `filename', introduced in rev. 58466.
Also remove an unnecessary incref/decref for `name'.
| author | Georg Brandl <georg@python.org> |
|---|---|
| date | Wed, 24 Oct 2007 21:14:07 +0000 |
| parents | 19319e70fc3e |
| children | 0d462d789b18 |
| rev | line source |
|---|---|
| 35742 | 1 #include "Python.h" |
| 2 #include "code.h" | |
| 3 #include "structmember.h" | |
| 4 | |
| 5 #define NAME_CHARS \ | |
| 6 "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz" | |
| 7 | |
| 8 /* all_name_chars(s): true iff all chars in s are valid NAME_CHARS */ | |
| 9 | |
| 10 static int | |
| 11 all_name_chars(unsigned char *s) | |
| 12 { | |
| 13 static char ok_name_char[256]; | |
| 14 static unsigned char *name_chars = (unsigned char *)NAME_CHARS; | |
| 15 | |
| 16 if (ok_name_char[*name_chars] == 0) { | |
| 17 unsigned char *p; | |
| 18 for (p = name_chars; *p; p++) | |
| 19 ok_name_char[*p] = 1; | |
| 20 } | |
| 21 while (*s) { | |
| 22 if (ok_name_char[*s++] == 0) | |
| 23 return 0; | |
| 24 } | |
| 25 return 1; | |
| 26 } | |
| 27 | |
| 28 static void | |
| 29 intern_strings(PyObject *tuple) | |
| 30 { | |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
35742
diff
changeset
|
31 Py_ssize_t i; |
| 35742 | 32 |
| 33 for (i = PyTuple_GET_SIZE(tuple); --i >= 0; ) { | |
| 34 PyObject *v = PyTuple_GET_ITEM(tuple, i); | |
|
42013
cd125fe83051
Make identifiers str (not str8) objects throughout.
Martin v. Löwis <martin@v.loewis.de>
parents:
41962
diff
changeset
|
35 if (v == NULL || !PyUnicode_CheckExact(v)) { |
| 35742 | 36 Py_FatalError("non-string found in code slot"); |
| 37 } | |
|
42013
cd125fe83051
Make identifiers str (not str8) objects throughout.
Martin v. Löwis <martin@v.loewis.de>
parents:
41962
diff
changeset
|
38 PyUnicode_InternInPlace(&PyTuple_GET_ITEM(tuple, i)); |
| 35742 | 39 } |
| 40 } | |
| 41 | |
| 42 | |
| 43 PyCodeObject * | |
|
40215
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
44 PyCode_New(int argcount, int kwonlyargcount, |
|
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
45 int nlocals, int stacksize, int flags, |
| 35742 | 46 PyObject *code, PyObject *consts, PyObject *names, |
| 47 PyObject *varnames, PyObject *freevars, PyObject *cellvars, | |
| 48 PyObject *filename, PyObject *name, int firstlineno, | |
| 49 PyObject *lnotab) | |
| 50 { | |
| 51 PyCodeObject *co; | |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
35742
diff
changeset
|
52 Py_ssize_t i; |
|
43569
19319e70fc3e
Patch #1272, by Christian Heimes and Alexandre Vassalotti.
Guido van Rossum <guido@python.org>
parents:
42802
diff
changeset
|
53 |
| 35742 | 54 /* Check argument types */ |
| 55 if (argcount < 0 || nlocals < 0 || | |
| 56 code == NULL || | |
| 57 consts == NULL || !PyTuple_Check(consts) || | |
| 58 names == NULL || !PyTuple_Check(names) || | |
| 59 varnames == NULL || !PyTuple_Check(varnames) || | |
| 60 freevars == NULL || !PyTuple_Check(freevars) || | |
| 61 cellvars == NULL || !PyTuple_Check(cellvars) || | |
|
43569
19319e70fc3e
Patch #1272, by Christian Heimes and Alexandre Vassalotti.
Guido van Rossum <guido@python.org>
parents:
42802
diff
changeset
|
62 name == NULL || !PyUnicode_Check(name) || |
|
19319e70fc3e
Patch #1272, by Christian Heimes and Alexandre Vassalotti.
Guido van Rossum <guido@python.org>
parents:
42802
diff
changeset
|
63 filename == NULL || !PyUnicode_Check(filename) || |
| 35742 | 64 lnotab == NULL || !PyString_Check(lnotab) || |
| 65 !PyObject_CheckReadBuffer(code)) { | |
| 66 PyErr_BadInternalCall(); | |
| 67 return NULL; | |
| 68 } | |
| 69 intern_strings(names); | |
| 70 intern_strings(varnames); | |
| 71 intern_strings(freevars); | |
| 72 intern_strings(cellvars); | |
| 73 /* Intern selected string constants */ | |
| 74 for (i = PyTuple_Size(consts); --i >= 0; ) { | |
| 75 PyObject *v = PyTuple_GetItem(consts, i); | |
| 76 if (!PyString_Check(v)) | |
| 77 continue; | |
| 78 if (!all_name_chars((unsigned char *)PyString_AS_STRING(v))) | |
| 79 continue; | |
| 80 PyString_InternInPlace(&PyTuple_GET_ITEM(consts, i)); | |
| 81 } | |
| 82 co = PyObject_NEW(PyCodeObject, &PyCode_Type); | |
| 83 if (co != NULL) { | |
| 84 co->co_argcount = argcount; | |
|
40215
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
85 co->co_kwonlyargcount = kwonlyargcount; |
| 35742 | 86 co->co_nlocals = nlocals; |
| 87 co->co_stacksize = stacksize; | |
| 88 co->co_flags = flags; | |
| 89 Py_INCREF(code); | |
| 90 co->co_code = code; | |
| 91 Py_INCREF(consts); | |
| 92 co->co_consts = consts; | |
| 93 Py_INCREF(names); | |
| 94 co->co_names = names; | |
| 95 Py_INCREF(varnames); | |
| 96 co->co_varnames = varnames; | |
| 97 Py_INCREF(freevars); | |
| 98 co->co_freevars = freevars; | |
| 99 Py_INCREF(cellvars); | |
| 100 co->co_cellvars = cellvars; | |
| 101 Py_INCREF(filename); | |
| 102 co->co_filename = filename; | |
| 103 Py_INCREF(name); | |
| 104 co->co_name = name; | |
| 105 co->co_firstlineno = firstlineno; | |
| 106 Py_INCREF(lnotab); | |
| 107 co->co_lnotab = lnotab; | |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
108 co->co_zombieframe = NULL; |
| 35742 | 109 } |
| 110 return co; | |
| 111 } | |
| 112 | |
| 113 | |
| 114 #define OFF(x) offsetof(PyCodeObject, x) | |
| 115 | |
| 116 static PyMemberDef code_memberlist[] = { | |
| 117 {"co_argcount", T_INT, OFF(co_argcount), READONLY}, | |
|
40215
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
118 {"co_kwonlyargcount", T_INT, OFF(co_kwonlyargcount), READONLY}, |
| 35742 | 119 {"co_nlocals", T_INT, OFF(co_nlocals), READONLY}, |
| 120 {"co_stacksize",T_INT, OFF(co_stacksize), READONLY}, | |
| 121 {"co_flags", T_INT, OFF(co_flags), READONLY}, | |
| 122 {"co_code", T_OBJECT, OFF(co_code), READONLY}, | |
| 123 {"co_consts", T_OBJECT, OFF(co_consts), READONLY}, | |
| 124 {"co_names", T_OBJECT, OFF(co_names), READONLY}, | |
| 125 {"co_varnames", T_OBJECT, OFF(co_varnames), READONLY}, | |
| 126 {"co_freevars", T_OBJECT, OFF(co_freevars), READONLY}, | |
| 127 {"co_cellvars", T_OBJECT, OFF(co_cellvars), READONLY}, | |
| 128 {"co_filename", T_OBJECT, OFF(co_filename), READONLY}, | |
| 129 {"co_name", T_OBJECT, OFF(co_name), READONLY}, | |
| 130 {"co_firstlineno", T_INT, OFF(co_firstlineno), READONLY}, | |
| 131 {"co_lnotab", T_OBJECT, OFF(co_lnotab), READONLY}, | |
| 132 {NULL} /* Sentinel */ | |
| 133 }; | |
| 134 | |
| 135 /* Helper for code_new: return a shallow copy of a tuple that is | |
| 136 guaranteed to contain exact strings, by converting string subclasses | |
| 137 to exact strings and complaining if a non-string is found. */ | |
| 138 static PyObject* | |
| 139 validate_and_copy_tuple(PyObject *tup) | |
| 140 { | |
| 141 PyObject *newtuple; | |
| 142 PyObject *item; | |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
35742
diff
changeset
|
143 Py_ssize_t i, len; |
| 35742 | 144 |
| 145 len = PyTuple_GET_SIZE(tup); | |
| 146 newtuple = PyTuple_New(len); | |
| 147 if (newtuple == NULL) | |
| 148 return NULL; | |
| 149 | |
| 150 for (i = 0; i < len; i++) { | |
| 151 item = PyTuple_GET_ITEM(tup, i); | |
|
42013
cd125fe83051
Make identifiers str (not str8) objects throughout.
Martin v. Löwis <martin@v.loewis.de>
parents:
41962
diff
changeset
|
152 if (PyUnicode_CheckExact(item)) { |
| 35742 | 153 Py_INCREF(item); |
| 154 } | |
|
42013
cd125fe83051
Make identifiers str (not str8) objects throughout.
Martin v. Löwis <martin@v.loewis.de>
parents:
41962
diff
changeset
|
155 else if (!PyUnicode_Check(item)) { |
| 35742 | 156 PyErr_Format( |
| 157 PyExc_TypeError, | |
| 158 "name tuples must contain only " | |
| 159 "strings, not '%.500s'", | |
| 160 item->ob_type->tp_name); | |
| 161 Py_DECREF(newtuple); | |
| 162 return NULL; | |
| 163 } | |
| 164 else { | |
|
42013
cd125fe83051
Make identifiers str (not str8) objects throughout.
Martin v. Löwis <martin@v.loewis.de>
parents:
41962
diff
changeset
|
165 item = PyUnicode_FromUnicode( |
|
cd125fe83051
Make identifiers str (not str8) objects throughout.
Martin v. Löwis <martin@v.loewis.de>
parents:
41962
diff
changeset
|
166 PyUnicode_AS_UNICODE(item), |
|
cd125fe83051
Make identifiers str (not str8) objects throughout.
Martin v. Löwis <martin@v.loewis.de>
parents:
41962
diff
changeset
|
167 PyUnicode_GET_SIZE(item)); |
| 35742 | 168 if (item == NULL) { |
| 169 Py_DECREF(newtuple); | |
| 170 return NULL; | |
| 171 } | |
| 172 } | |
| 173 PyTuple_SET_ITEM(newtuple, i, item); | |
| 174 } | |
| 175 | |
| 176 return newtuple; | |
| 177 } | |
| 178 | |
| 179 PyDoc_STRVAR(code_doc, | |
| 180 "code(argcount, nlocals, stacksize, flags, codestring, constants, names,\n\ | |
| 181 varnames, filename, name, firstlineno, lnotab[, freevars[, cellvars]])\n\ | |
| 182 \n\ | |
| 183 Create a code object. Not for the faint of heart."); | |
| 184 | |
| 185 static PyObject * | |
| 186 code_new(PyTypeObject *type, PyObject *args, PyObject *kw) | |
| 187 { | |
| 188 int argcount; | |
|
40215
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
189 int kwonlyargcount; |
| 35742 | 190 int nlocals; |
| 191 int stacksize; | |
| 192 int flags; | |
| 193 PyObject *co = NULL; | |
| 194 PyObject *code; | |
| 195 PyObject *consts; | |
| 196 PyObject *names, *ournames = NULL; | |
| 197 PyObject *varnames, *ourvarnames = NULL; | |
| 198 PyObject *freevars = NULL, *ourfreevars = NULL; | |
| 199 PyObject *cellvars = NULL, *ourcellvars = NULL; | |
| 200 PyObject *filename; | |
| 201 PyObject *name; | |
| 202 int firstlineno; | |
| 203 PyObject *lnotab; | |
| 204 | |
|
40215
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
205 if (!PyArg_ParseTuple(args, "iiiiiSO!O!O!SSiS|O!O!:code", |
|
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
206 &argcount, &kwonlyargcount, |
|
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
207 &nlocals, &stacksize, &flags, |
| 35742 | 208 &code, |
| 209 &PyTuple_Type, &consts, | |
| 210 &PyTuple_Type, &names, | |
| 211 &PyTuple_Type, &varnames, | |
| 212 &filename, &name, | |
| 213 &firstlineno, &lnotab, | |
| 214 &PyTuple_Type, &freevars, | |
| 215 &PyTuple_Type, &cellvars)) | |
| 216 return NULL; | |
| 217 | |
| 218 if (argcount < 0) { | |
| 219 PyErr_SetString( | |
| 220 PyExc_ValueError, | |
| 221 "code: argcount must not be negative"); | |
| 222 goto cleanup; | |
| 223 } | |
| 224 | |
|
40215
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
225 if (kwonlyargcount < 0) { |
|
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
226 PyErr_SetString( |
|
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
227 PyExc_ValueError, |
|
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
228 "code: kwonlyargcount must not be negative"); |
|
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
229 goto cleanup; |
|
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
230 } |
| 35742 | 231 if (nlocals < 0) { |
| 232 PyErr_SetString( | |
| 233 PyExc_ValueError, | |
| 234 "code: nlocals must not be negative"); | |
| 235 goto cleanup; | |
| 236 } | |
| 237 | |
| 238 ournames = validate_and_copy_tuple(names); | |
| 239 if (ournames == NULL) | |
| 240 goto cleanup; | |
| 241 ourvarnames = validate_and_copy_tuple(varnames); | |
| 242 if (ourvarnames == NULL) | |
| 243 goto cleanup; | |
| 244 if (freevars) | |
| 245 ourfreevars = validate_and_copy_tuple(freevars); | |
| 246 else | |
| 247 ourfreevars = PyTuple_New(0); | |
| 248 if (ourfreevars == NULL) | |
| 249 goto cleanup; | |
| 250 if (cellvars) | |
| 251 ourcellvars = validate_and_copy_tuple(cellvars); | |
| 252 else | |
| 253 ourcellvars = PyTuple_New(0); | |
| 254 if (ourcellvars == NULL) | |
| 255 goto cleanup; | |
| 256 | |
|
40215
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
257 co = (PyObject *)PyCode_New(argcount, kwonlyargcount, |
|
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
258 nlocals, stacksize, flags, |
| 35742 | 259 code, consts, ournames, ourvarnames, |
| 260 ourfreevars, ourcellvars, filename, | |
| 261 name, firstlineno, lnotab); | |
| 262 cleanup: | |
| 263 Py_XDECREF(ournames); | |
| 264 Py_XDECREF(ourvarnames); | |
| 265 Py_XDECREF(ourfreevars); | |
| 266 Py_XDECREF(ourcellvars); | |
| 267 return co; | |
| 268 } | |
| 269 | |
| 270 static void | |
| 271 code_dealloc(PyCodeObject *co) | |
| 272 { | |
| 273 Py_XDECREF(co->co_code); | |
| 274 Py_XDECREF(co->co_consts); | |
| 275 Py_XDECREF(co->co_names); | |
| 276 Py_XDECREF(co->co_varnames); | |
| 277 Py_XDECREF(co->co_freevars); | |
| 278 Py_XDECREF(co->co_cellvars); | |
| 279 Py_XDECREF(co->co_filename); | |
| 280 Py_XDECREF(co->co_name); | |
| 281 Py_XDECREF(co->co_lnotab); | |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
282 if (co->co_zombieframe != NULL) |
|
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
283 PyObject_GC_Del(co->co_zombieframe); |
| 35742 | 284 PyObject_DEL(co); |
| 285 } | |
| 286 | |
| 287 static PyObject * | |
| 288 code_repr(PyCodeObject *co) | |
| 289 { | |
| 290 int lineno = -1; | |
| 291 char *filename = "???"; | |
| 292 | |
| 293 if (co->co_firstlineno != 0) | |
| 294 lineno = co->co_firstlineno; | |
|
43569
19319e70fc3e
Patch #1272, by Christian Heimes and Alexandre Vassalotti.
Guido van Rossum <guido@python.org>
parents:
42802
diff
changeset
|
295 if (co->co_filename && PyUnicode_Check(co->co_filename)) |
|
19319e70fc3e
Patch #1272, by Christian Heimes and Alexandre Vassalotti.
Guido van Rossum <guido@python.org>
parents:
42802
diff
changeset
|
296 filename = PyUnicode_AsString(co->co_filename); |
|
41962
11930dcf9d4f
Use PyUnicode_FromFormat() directly.
Walter Dörwald <walter@livinglogic.de>
parents:
41769
diff
changeset
|
297 return PyUnicode_FromFormat( |
|
42802
01ee6311ba46
Ensure that code object names (co_name) are unicode.
Neal Norwitz <nnorwitz@gmail.com>
parents:
42334
diff
changeset
|
298 "<code object %.100U at %p, file \"%.300s\", line %d>", |
|
01ee6311ba46
Ensure that code object names (co_name) are unicode.
Neal Norwitz <nnorwitz@gmail.com>
parents:
42334
diff
changeset
|
299 co->co_name, co, filename, lineno); |
| 35742 | 300 } |
| 301 | |
|
39644
13d5e5f0e993
Restructure comparison dramatically. There is no longer a default
Guido van Rossum <guido@python.org>
parents:
39442
diff
changeset
|
302 static PyObject * |
|
13d5e5f0e993
Restructure comparison dramatically. There is no longer a default
Guido van Rossum <guido@python.org>
parents:
39442
diff
changeset
|
303 code_richcompare(PyObject *self, PyObject *other, int op) |
| 35742 | 304 { |
|
39650
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
305 PyCodeObject *co, *cp; |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
306 int eq; |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
307 PyObject *res; |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
308 |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
309 if ((op != Py_EQ && op != Py_NE) || |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
310 !PyCode_Check(self) || |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
311 !PyCode_Check(other)) { |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
312 Py_INCREF(Py_NotImplemented); |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
313 return Py_NotImplemented; |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
314 } |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
315 |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
316 co = (PyCodeObject *)self; |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
317 cp = (PyCodeObject *)other; |
|
39644
13d5e5f0e993
Restructure comparison dramatically. There is no longer a default
Guido van Rossum <guido@python.org>
parents:
39442
diff
changeset
|
318 |
|
39658
a5048c8d8f33
Fix a bunch of compiler warnings. In at least one case these were serious bugs!
Guido van Rossum <guido@python.org>
parents:
39650
diff
changeset
|
319 eq = PyObject_RichCompareBool(co->co_name, cp->co_name, Py_EQ); |
|
39650
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
320 if (eq <= 0) goto unequal; |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
321 eq = co->co_argcount == cp->co_argcount; |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
322 if (!eq) goto unequal; |
|
40215
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
323 eq = co->co_kwonlyargcount == cp->co_kwonlyargcount; |
|
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
324 if (!eq) goto unequal; |
|
39650
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
325 eq = co->co_nlocals == cp->co_nlocals; |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
326 if (!eq) goto unequal; |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
327 eq = co->co_flags == cp->co_flags; |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
328 if (!eq) goto unequal; |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
329 eq = co->co_firstlineno == cp->co_firstlineno; |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
330 if (!eq) goto unequal; |
|
39658
a5048c8d8f33
Fix a bunch of compiler warnings. In at least one case these were serious bugs!
Guido van Rossum <guido@python.org>
parents:
39650
diff
changeset
|
331 eq = PyObject_RichCompareBool(co->co_code, cp->co_code, Py_EQ); |
|
39650
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
332 if (eq <= 0) goto unequal; |
|
39658
a5048c8d8f33
Fix a bunch of compiler warnings. In at least one case these were serious bugs!
Guido van Rossum <guido@python.org>
parents:
39650
diff
changeset
|
333 eq = PyObject_RichCompareBool(co->co_consts, cp->co_consts, Py_EQ); |
|
39650
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
334 if (eq <= 0) goto unequal; |
|
39658
a5048c8d8f33
Fix a bunch of compiler warnings. In at least one case these were serious bugs!
Guido van Rossum <guido@python.org>
parents:
39650
diff
changeset
|
335 eq = PyObject_RichCompareBool(co->co_names, cp->co_names, Py_EQ); |
|
39650
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
336 if (eq <= 0) goto unequal; |
|
39658
a5048c8d8f33
Fix a bunch of compiler warnings. In at least one case these were serious bugs!
Guido van Rossum <guido@python.org>
parents:
39650
diff
changeset
|
337 eq = PyObject_RichCompareBool(co->co_varnames, cp->co_varnames, Py_EQ); |
|
39650
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
338 if (eq <= 0) goto unequal; |
|
39658
a5048c8d8f33
Fix a bunch of compiler warnings. In at least one case these were serious bugs!
Guido van Rossum <guido@python.org>
parents:
39650
diff
changeset
|
339 eq = PyObject_RichCompareBool(co->co_freevars, cp->co_freevars, Py_EQ); |
|
39650
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
340 if (eq <= 0) goto unequal; |
|
39658
a5048c8d8f33
Fix a bunch of compiler warnings. In at least one case these were serious bugs!
Guido van Rossum <guido@python.org>
parents:
39650
diff
changeset
|
341 eq = PyObject_RichCompareBool(co->co_cellvars, cp->co_cellvars, Py_EQ); |
|
39650
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
342 if (eq <= 0) goto unequal; |
| 35742 | 343 |
|
39650
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
344 if (op == Py_EQ) |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
345 res = Py_True; |
| 35742 | 346 else |
|
39650
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
347 res = Py_False; |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
348 goto done; |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
349 |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
350 unequal: |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
351 if (eq < 0) |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
352 return NULL; |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
353 if (op == Py_NE) |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
354 res = Py_True; |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
355 else |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
356 res = Py_False; |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
357 |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
358 done: |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
359 Py_INCREF(res); |
|
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
360 return res; |
| 35742 | 361 } |
| 362 | |
| 363 static long | |
| 364 code_hash(PyCodeObject *co) | |
| 365 { | |
| 366 long h, h0, h1, h2, h3, h4, h5, h6; | |
| 367 h0 = PyObject_Hash(co->co_name); | |
| 368 if (h0 == -1) return -1; | |
| 369 h1 = PyObject_Hash(co->co_code); | |
| 370 if (h1 == -1) return -1; | |
| 371 h2 = PyObject_Hash(co->co_consts); | |
| 372 if (h2 == -1) return -1; | |
| 373 h3 = PyObject_Hash(co->co_names); | |
| 374 if (h3 == -1) return -1; | |
| 375 h4 = PyObject_Hash(co->co_varnames); | |
| 376 if (h4 == -1) return -1; | |
| 377 h5 = PyObject_Hash(co->co_freevars); | |
| 378 if (h5 == -1) return -1; | |
| 379 h6 = PyObject_Hash(co->co_cellvars); | |
| 380 if (h6 == -1) return -1; | |
| 381 h = h0 ^ h1 ^ h2 ^ h3 ^ h4 ^ h5 ^ h6 ^ | |
|
40215
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
382 co->co_argcount ^ co->co_kwonlyargcount ^ |
|
1cce0526d9b0
Jiwon Seo's PEP 3102 implementation.
Guido van Rossum <guido@python.org>
parents:
39658
diff
changeset
|
383 co->co_nlocals ^ co->co_flags; |
| 35742 | 384 if (h == -1) h = -2; |
| 385 return h; | |
| 386 } | |
| 387 | |
| 388 /* XXX code objects need to participate in GC? */ | |
| 389 | |
| 390 PyTypeObject PyCode_Type = { | |
|
42334
e70cdce0e8b2
Merged revisions 56467-56482 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
42013
diff
changeset
|
391 PyVarObject_HEAD_INIT(&PyType_Type, 0) |
| 35742 | 392 "code", |
| 393 sizeof(PyCodeObject), | |
| 394 0, | |
| 395 (destructor)code_dealloc, /* tp_dealloc */ | |
| 396 0, /* tp_print */ | |
| 397 0, /* tp_getattr */ | |
| 398 0, /* tp_setattr */ | |
|
39644
13d5e5f0e993
Restructure comparison dramatically. There is no longer a default
Guido van Rossum <guido@python.org>
parents:
39442
diff
changeset
|
399 0, /* tp_compare */ |
| 35742 | 400 (reprfunc)code_repr, /* tp_repr */ |
| 401 0, /* tp_as_number */ | |
| 402 0, /* tp_as_sequence */ | |
| 403 0, /* tp_as_mapping */ | |
|
39650
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
404 (hashfunc)code_hash, /* tp_hash */ |
| 35742 | 405 0, /* tp_call */ |
| 406 0, /* tp_str */ | |
| 407 PyObject_GenericGetAttr, /* tp_getattro */ | |
| 408 0, /* tp_setattro */ | |
| 409 0, /* tp_as_buffer */ | |
| 410 Py_TPFLAGS_DEFAULT, /* tp_flags */ | |
| 411 code_doc, /* tp_doc */ | |
| 412 0, /* tp_traverse */ | |
| 413 0, /* tp_clear */ | |
|
39650
69f61f90c4fc
Implement == and != comparisons for code objects by value.
Guido van Rossum <guido@python.org>
parents:
39644
diff
changeset
|
414 code_richcompare, /* tp_richcompare */ |
| 35742 | 415 0, /* tp_weaklistoffset */ |
| 416 0, /* tp_iter */ | |
| 417 0, /* tp_iternext */ | |
| 418 0, /* tp_methods */ | |
| 419 code_memberlist, /* tp_members */ | |
| 420 0, /* tp_getset */ | |
| 421 0, /* tp_base */ | |
| 422 0, /* tp_dict */ | |
| 423 0, /* tp_descr_get */ | |
| 424 0, /* tp_descr_set */ | |
| 425 0, /* tp_dictoffset */ | |
| 426 0, /* tp_init */ | |
| 427 0, /* tp_alloc */ | |
| 428 code_new, /* tp_new */ | |
| 429 }; | |
| 430 | |
| 431 /* All about c_lnotab. | |
| 432 | |
| 433 c_lnotab is an array of unsigned bytes disguised as a Python string. In -O | |
| 434 mode, SET_LINENO opcodes aren't generated, and bytecode offsets are mapped | |
| 435 to source code line #s (when needed for tracebacks) via c_lnotab instead. | |
| 436 The array is conceptually a list of | |
| 437 (bytecode offset increment, line number increment) | |
| 438 pairs. The details are important and delicate, best illustrated by example: | |
| 439 | |
| 440 byte code offset source code line number | |
| 441 0 1 | |
| 442 6 2 | |
| 443 50 7 | |
| 444 350 307 | |
| 445 361 308 | |
| 446 | |
| 447 The first trick is that these numbers aren't stored, only the increments | |
| 448 from one row to the next (this doesn't really work, but it's a start): | |
| 449 | |
| 450 0, 1, 6, 1, 44, 5, 300, 300, 11, 1 | |
| 451 | |
| 452 The second trick is that an unsigned byte can't hold negative values, or | |
| 453 values larger than 255, so (a) there's a deep assumption that byte code | |
| 454 offsets and their corresponding line #s both increase monotonically, and (b) | |
| 455 if at least one column jumps by more than 255 from one row to the next, more | |
| 456 than one pair is written to the table. In case #b, there's no way to know | |
| 457 from looking at the table later how many were written. That's the delicate | |
| 458 part. A user of c_lnotab desiring to find the source line number | |
| 459 corresponding to a bytecode address A should do something like this | |
| 460 | |
| 461 lineno = addr = 0 | |
| 462 for addr_incr, line_incr in c_lnotab: | |
| 463 addr += addr_incr | |
| 464 if addr > A: | |
| 465 return lineno | |
| 466 lineno += line_incr | |
| 467 | |
| 468 In order for this to work, when the addr field increments by more than 255, | |
| 469 the line # increment in each pair generated must be 0 until the remaining addr | |
| 470 increment is < 256. So, in the example above, com_set_lineno should not (as | |
| 471 was actually done until 2.2) expand 300, 300 to 255, 255, 45, 45, but to | |
| 472 255, 0, 45, 255, 0, 45. | |
| 473 */ | |
| 474 | |
| 475 int | |
| 476 PyCode_Addr2Line(PyCodeObject *co, int addrq) | |
| 477 { | |
| 478 int size = PyString_Size(co->co_lnotab) / 2; | |
| 479 unsigned char *p = (unsigned char*)PyString_AsString(co->co_lnotab); | |
| 480 int line = co->co_firstlineno; | |
| 481 int addr = 0; | |
| 482 while (--size >= 0) { | |
| 483 addr += *p++; | |
| 484 if (addr > addrq) | |
| 485 break; | |
| 486 line += *p++; | |
| 487 } | |
| 488 return line; | |
| 489 } | |
|
37879
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
490 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
491 /* |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
492 Check whether the current instruction is at the start of a line. |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
493 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
494 */ |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
495 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
496 /* The theory of SET_LINENO-less tracing. |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
497 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
498 In a nutshell, we use the co_lnotab field of the code object |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
499 to tell when execution has moved onto a different line. |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
500 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
501 As mentioned above, the basic idea is so set things up so |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
502 that |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
503 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
504 *instr_lb <= frame->f_lasti < *instr_ub |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
505 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
506 is true so long as execution does not change lines. |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
507 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
508 This is all fairly simple. Digging the information out of |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
509 co_lnotab takes some work, but is conceptually clear. |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
510 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
511 Somewhat harder to explain is why we don't *always* call the |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
512 line trace function when the above test fails. |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
513 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
514 Consider this code: |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
515 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
516 1: def f(a): |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
517 2: if a: |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
518 3: print 1 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
519 4: else: |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
520 5: print 2 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
521 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
522 which compiles to this: |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
523 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
524 2 0 LOAD_FAST 0 (a) |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
525 3 JUMP_IF_FALSE 9 (to 15) |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
526 6 POP_TOP |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
527 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
528 3 7 LOAD_CONST 1 (1) |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
529 10 PRINT_ITEM |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
530 11 PRINT_NEWLINE |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
531 12 JUMP_FORWARD 6 (to 21) |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
532 >> 15 POP_TOP |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
533 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
534 5 16 LOAD_CONST 2 (2) |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
535 19 PRINT_ITEM |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
536 20 PRINT_NEWLINE |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
537 >> 21 LOAD_CONST 0 (None) |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
538 24 RETURN_VALUE |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
539 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
540 If 'a' is false, execution will jump to instruction at offset |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
541 15 and the co_lnotab will claim that execution has moved to |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
542 line 3. This is at best misleading. In this case we could |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
543 associate the POP_TOP with line 4, but that doesn't make |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
544 sense in all cases (I think). |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
545 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
546 What we do is only call the line trace function if the co_lnotab |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
547 indicates we have jumped to the *start* of a line, i.e. if the |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
548 current instruction offset matches the offset given for the |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
549 start of a line by the co_lnotab. |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
550 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
551 This also takes care of the situation where 'a' is true. |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
552 Execution will jump from instruction offset 12 to offset 21. |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
553 Then the co_lnotab would imply that execution has moved to line |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
554 5, which is again misleading. |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
555 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
556 Why do we set f_lineno when tracing? Well, consider the code |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
557 above when 'a' is true. If stepping through this with 'n' in |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
558 pdb, you would stop at line 1 with a "call" type event, then |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
559 line events on lines 2 and 3, then a "return" type event -- but |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
560 you would be shown line 5 during this event. This is a change |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
561 from the behaviour in 2.2 and before, and I've found it |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
562 confusing in practice. By setting and using f_lineno when |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
563 tracing, one can report a line number different from that |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
564 suggested by f_lasti on this one occasion where it's desirable. |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
565 */ |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
566 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
567 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
568 int |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
569 PyCode_CheckLineNumber(PyCodeObject* co, int lasti, PyAddrPair *bounds) |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
570 { |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
571 int size, addr, line; |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
572 unsigned char* p; |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
573 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
574 p = (unsigned char*)PyString_AS_STRING(co->co_lnotab); |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
575 size = PyString_GET_SIZE(co->co_lnotab) / 2; |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
576 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
577 addr = 0; |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
578 line = co->co_firstlineno; |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
579 assert(line > 0); |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
580 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
581 /* possible optimization: if f->f_lasti == instr_ub |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
582 (likely to be a common case) then we already know |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
583 instr_lb -- if we stored the matching value of p |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
584 somwhere we could skip the first while loop. */ |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
585 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
586 /* see comments in compile.c for the description of |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
587 co_lnotab. A point to remember: increments to p |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
588 should come in pairs -- although we don't care about |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
589 the line increments here, treating them as byte |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
590 increments gets confusing, to say the least. */ |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
591 |
|
39442
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38453
diff
changeset
|
592 bounds->ap_lower = 0; |
|
37879
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
593 while (size > 0) { |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
594 if (addr + *p > lasti) |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
595 break; |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
596 addr += *p++; |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
597 if (*p) |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
598 bounds->ap_lower = addr; |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
599 line += *p++; |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
600 --size; |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
601 } |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
602 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
603 /* If lasti and addr don't match exactly, we don't want to |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
604 change the lineno slot on the frame or execute a trace |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
605 function. Return -1 instead. |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
606 */ |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
607 if (addr != lasti) |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
608 line = -1; |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
609 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
610 if (size > 0) { |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
611 while (--size >= 0) { |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
612 addr += *p++; |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
613 if (*p++) |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
614 break; |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
615 } |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
616 bounds->ap_upper = addr; |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
617 } |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
618 else { |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
619 bounds->ap_upper = INT_MAX; |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
620 } |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
621 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
622 return line; |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36501
diff
changeset
|
623 } |