Mercurial > cpython-lru_cache-weakref

annotate Python/ceval.c @ 82459:f1d3fbcd837d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
#17032: The "global" in the "NameError: global name 'x' is not defined" error message has been removed. Patch by Ram Rachum.
author Ezio Melotti <ezio.melotti@gmail.com>
date Sun, 03 Mar 2013 15:12:44 +0200
parents d296cf1600a8
children 6297fcddf912
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
145
853b736a6a9e Added copyright notice.
Guido van Rossum <guido@python.org>
parents: 119
diff changeset
1
86
a6934380c6e7 "Compiling" version
Guido van Rossum <guido@python.org>
parents: 72
diff changeset
2 /* Execute compiled code */
69
cccd534f2280 Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
3
2844
0261bf5b3819 keyword arguments and faster calls
Guido van Rossum <guido@python.org>
parents: 2813
diff changeset
4 /* XXX TO DO:
0261bf5b3819 keyword arguments and faster calls
Guido van Rossum <guido@python.org>
parents: 2813
diff changeset
5 XXX speed up searching for keywords by using a dictionary
0261bf5b3819 keyword arguments and faster calls
Guido van Rossum <guido@python.org>
parents: 2813
diff changeset
6 XXX document it!
0261bf5b3819 keyword arguments and faster calls
Guido van Rossum <guido@python.org>
parents: 2813
diff changeset
7 */
0261bf5b3819 keyword arguments and faster calls
Guido van Rossum <guido@python.org>
parents: 2813
diff changeset
8
38453
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents: 37879
diff changeset
9 /* enable more aggressive intra-module optimizations, where available */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents: 37879
diff changeset
10 #define PY_LOCAL_AGGRESSIVE
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents: 37879
diff changeset
11
5368
f2132d1f66a6 Quickly renamed.
Guido van Rossum <guido@python.org>
parents: 5177
diff changeset
12 #include "Python.h"
86
a6934380c6e7 "Compiling" version
Guido van Rossum <guido@python.org>
parents: 72
diff changeset
13
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 35609
diff changeset
14 #include "code.h"
86
a6934380c6e7 "Compiling" version
Guido van Rossum <guido@python.org>
parents: 72
diff changeset
15 #include "frameobject.h"
69
cccd534f2280 Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
16 #include "opcode.h"
18933
09df3254b49d Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents: 18611
diff changeset
17 #include "structmember.h"
69
cccd534f2280 Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
18
1400
aac8231a715c * mpzmodule.c: removed redundant mpz_print function.
Guido van Rossum <guido@python.org>
parents: 1391
diff changeset
19 #include <ctype.h>
aac8231a715c * mpzmodule.c: removed redundant mpz_print function.
Guido van Rossum <guido@python.org>
parents: 1391
diff changeset
20
38453
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents: 37879
diff changeset
21 #ifndef WITH_TSC
34442
683719e04218 Change the name of the macro used by --with-tsc builds to the less
Michael W. Hudson <mwh@python.net>
parents: 34371
diff changeset
22
683719e04218 Change the name of the macro used by --with-tsc builds to the less
Michael W. Hudson <mwh@python.net>
parents: 34371
diff changeset
23 #define READ_TIMESTAMP(var)
683719e04218 Change the name of the macro used by --with-tsc builds to the less
Michael W. Hudson <mwh@python.net>
parents: 34371
diff changeset
24
683719e04218 Change the name of the macro used by --with-tsc builds to the less
Michael W. Hudson <mwh@python.net>
parents: 34371
diff changeset
25 #else
32301
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
26
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
27 typedef unsigned long long uint64;
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
28
68585
bf94b6a73fc8 #11565: Fix several typos. Patch by Piotr Kasprzyk.
Ezio Melotti <ezio.melotti@gmail.com>
parents: 67414
diff changeset
29 /* PowerPC support.
67414
7e7fc94fd0d4 Merged revisions 87796 via svnmerge from
David Malcolm <dmalcolm@redhat.com>
parents: 62462
diff changeset
30 "__ppc__" appears to be the preprocessor definition to detect on OS X, whereas
7e7fc94fd0d4 Merged revisions 87796 via svnmerge from
David Malcolm <dmalcolm@redhat.com>
parents: 62462
diff changeset
31 "__powerpc__" appears to be the correct one for Linux with GCC
7e7fc94fd0d4 Merged revisions 87796 via svnmerge from
David Malcolm <dmalcolm@redhat.com>
parents: 62462
diff changeset
32 */
7e7fc94fd0d4 Merged revisions 87796 via svnmerge from
David Malcolm <dmalcolm@redhat.com>
parents: 62462
diff changeset
33 #if defined(__ppc__) || defined (__powerpc__)
33104
f455bbe7ea7e This is my patch:
Michael W. Hudson <mwh@python.net>
parents: 33030
diff changeset
34
34442
683719e04218 Change the name of the macro used by --with-tsc builds to the less
Michael W. Hudson <mwh@python.net>
parents: 34371
diff changeset
35 #define READ_TIMESTAMP(var) ppc_getcounter(&var)
33104
f455bbe7ea7e This is my patch:
Michael W. Hudson <mwh@python.net>
parents: 33030
diff changeset
36
f455bbe7ea7e This is my patch:
Michael W. Hudson <mwh@python.net>
parents: 33030
diff changeset
37 static void
f455bbe7ea7e This is my patch:
Michael W. Hudson <mwh@python.net>
parents: 33030
diff changeset
38 ppc_getcounter(uint64 *v)
f455bbe7ea7e This is my patch:
Michael W. Hudson <mwh@python.net>
parents: 33030
diff changeset
39 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
40 register unsigned long tbu, tb, tbu2;
33104
f455bbe7ea7e This is my patch:
Michael W. Hudson <mwh@python.net>
parents: 33030
diff changeset
41
f455bbe7ea7e This is my patch:
Michael W. Hudson <mwh@python.net>
parents: 33030
diff changeset
42 loop:
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
43 asm volatile ("mftbu %0" : "=r" (tbu) );
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
44 asm volatile ("mftb %0" : "=r" (tb) );
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
45 asm volatile ("mftbu %0" : "=r" (tbu2));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
46 if (__builtin_expect(tbu != tbu2, 0)) goto loop;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
47
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
48 /* The slightly peculiar way of writing the next lines is
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
49 compiled better by GCC than any other way I tried. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
50 ((long*)(v))[0] = tbu;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
51 ((long*)(v))[1] = tb;
33104
f455bbe7ea7e This is my patch:
Michael W. Hudson <mwh@python.net>
parents: 33030
diff changeset
52 }
f455bbe7ea7e This is my patch:
Michael W. Hudson <mwh@python.net>
parents: 33030
diff changeset
53
57005
264a735a8af7 Merged revisions 75984 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents: 54459
diff changeset
54 #elif defined(__i386__)
264a735a8af7 Merged revisions 75984 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents: 54459
diff changeset
55
264a735a8af7 Merged revisions 75984 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents: 54459
diff changeset
56 /* this is for linux/x86 (and probably any other GCC/x86 combo) */
34442
683719e04218 Change the name of the macro used by --with-tsc builds to the less
Michael W. Hudson <mwh@python.net>
parents: 34371
diff changeset
57
683719e04218 Change the name of the macro used by --with-tsc builds to the less
Michael W. Hudson <mwh@python.net>
parents: 34371
diff changeset
58 #define READ_TIMESTAMP(val) \
683719e04218 Change the name of the macro used by --with-tsc builds to the less
Michael W. Hudson <mwh@python.net>
parents: 34371
diff changeset
59 __asm__ __volatile__("rdtsc" : "=A" (val))
33104
f455bbe7ea7e This is my patch:
Michael W. Hudson <mwh@python.net>
parents: 33030
diff changeset
60
57005
264a735a8af7 Merged revisions 75984 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents: 54459
diff changeset
61 #elif defined(__x86_64__)
264a735a8af7 Merged revisions 75984 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents: 54459
diff changeset
62
264a735a8af7 Merged revisions 75984 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents: 54459
diff changeset
63 /* for gcc/x86_64, the "A" constraint in DI mode means *either* rax *or* rdx;
264a735a8af7 Merged revisions 75984 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents: 54459
diff changeset
64 not edx:eax as it does for i386. Since rdtsc puts its result in edx:eax
264a735a8af7 Merged revisions 75984 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents: 54459
diff changeset
65 even in 64-bit mode, we need to use "a" and "d" for the lower and upper
264a735a8af7 Merged revisions 75984 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents: 54459
diff changeset
66 32-bit pieces of the result. */
264a735a8af7 Merged revisions 75984 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents: 54459
diff changeset
67
264a735a8af7 Merged revisions 75984 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents: 54459
diff changeset
68 #define READ_TIMESTAMP(val) \
264a735a8af7 Merged revisions 75984 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents: 54459
diff changeset
69 __asm__ __volatile__("rdtsc" : \
264a735a8af7 Merged revisions 75984 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents: 54459
diff changeset
70 "=a" (((int*)&(val))[0]), "=d" (((int*)&(val))[1]));
264a735a8af7 Merged revisions 75984 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents: 54459
diff changeset
71
264a735a8af7 Merged revisions 75984 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents: 54459
diff changeset
72
264a735a8af7 Merged revisions 75984 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents: 54459
diff changeset
73 #else
264a735a8af7 Merged revisions 75984 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents: 54459
diff changeset
74
264a735a8af7 Merged revisions 75984 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents: 54459
diff changeset
75 #error "Don't know how to implement timestamp counter for this architecture"
264a735a8af7 Merged revisions 75984 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents: 54459
diff changeset
76
33104
f455bbe7ea7e This is my patch:
Michael W. Hudson <mwh@python.net>
parents: 33030
diff changeset
77 #endif
f455bbe7ea7e This is my patch:
Michael W. Hudson <mwh@python.net>
parents: 33030
diff changeset
78
38453
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents: 37879
diff changeset
79 void dump_tsc(int opcode, int ticked, uint64 inst0, uint64 inst1,
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
80 uint64 loop0, uint64 loop1, uint64 intr0, uint64 intr1)
32301
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
81 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
82 uint64 intr, inst, loop;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
83 PyThreadState *tstate = PyThreadState_Get();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
84 if (!tstate->interp->tscdump)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
85 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
86 intr = intr1 - intr0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
87 inst = inst1 - inst0 - intr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
88 loop = loop1 - loop0 - intr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
89 fprintf(stderr, "opcode=%03d t=%d inst=%06lld loop=%06lld\n",
62462
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
90 opcode, ticked, inst, loop);
32301
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
91 }
33104
f455bbe7ea7e This is my patch:
Michael W. Hudson <mwh@python.net>
parents: 33030
diff changeset
92
32301
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
93 #endif
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
94
944
222f04f55083 Changes so that user-defined classes can implement operations invoked
Guido van Rossum <guido@python.org>
parents: 926
diff changeset
95 /* Turn this on if your compiler chokes on the big switch: */
2052
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of
Guido van Rossum <guido@python.org>
parents: 2006
diff changeset
96 /* #define CASE_TOO_BIG 1 */
944
222f04f55083 Changes so that user-defined classes can implement operations invoked
Guido van Rossum <guido@python.org>
parents: 926
diff changeset
97
4839
4567e158d20c Rename DEBUG macro to Py_DEBUG
Guido van Rossum <guido@python.org>
parents: 4667
diff changeset
98 #ifdef Py_DEBUG
567
8c179d023583 User trace feature.
Guido van Rossum <guido@python.org>
parents: 565
diff changeset
99 /* For debugging the interpreter: */
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
100 #define LLTRACE 1 /* Low-level trace feature */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
101 #define CHECKEXC 1 /* Double-check exception checking */
69
cccd534f2280 Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
102 #endif
cccd534f2280 Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
103
15711
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
104 typedef PyObject *(*callproc)(PyObject *, PyObject *, PyObject *);
1263
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access
Guido van Rossum <guido@python.org>
parents: 1262
diff changeset
105
173
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
106 /* Forward declarations */
32301
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
107 #ifdef WITH_TSC
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 static PyObject * call_function(PyObject ***, int, uint64*, uint64*);
32301
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
109 #else
38453
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents: 37879
diff changeset
110 static PyObject * call_function(PyObject ***, int);
32301
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
111 #endif
38453
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents: 37879
diff changeset
112 static PyObject * fast_function(PyObject *, PyObject ***, int, int, int);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents: 37879
diff changeset
113 static PyObject * do_call(PyObject *, PyObject ***, int, int);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents: 37879
diff changeset
114 static PyObject * ext_do_call(PyObject *, PyObject ***, int, int, int);
43418
0c8fec76111c Merged revisions 58211-58220 via svnmerge from
Thomas Wouters <thomas@python.org>
parents: 43411
diff changeset
115 static PyObject * update_keyword_args(PyObject *, int, PyObject ***,
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
116 PyObject *);
38453
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents: 37879
diff changeset
117 static PyObject * update_star_args(int, int, PyObject *, PyObject ***);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents: 37879
diff changeset
118 static PyObject * load_args(PyObject ***, int);
15711
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
119 #define CALL_FLAG_VAR 1
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
120 #define CALL_FLAG_KW 2
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
121
746
6c0f16008bd9 lint (added prototypes for all static fns)
Guido van Rossum <guido@python.org>
parents: 708
diff changeset
122 #ifdef LLTRACE
36695
b6d2f6fd3e11 PEP 343 -- the with-statement.
Guido van Rossum <guido@python.org>
parents: 36580
diff changeset
123 static int lltrace;
13447
a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO.
Tim Peters <tim.peters@gmail.com>
parents: 13256
diff changeset
124 static int prtrace(PyObject *, char *);
746
6c0f16008bd9 lint (added prototypes for all static fns)
Guido van Rossum <guido@python.org>
parents: 708
diff changeset
125 #endif
18326
e427afb5637f Revise the interface to the profiling and tracing support for the
Fred Drake <fdrake@acm.org>
parents: 18293
diff changeset
126 static int call_trace(Py_tracefunc, PyObject *, PyFrameObject *,
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
127 int, PyObject *);
43840
73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement).
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 43815
diff changeset
128 static int call_trace_protected(Py_tracefunc, PyObject *,
62462
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
129 PyFrameObject *, int, PyObject *);
18326
e427afb5637f Revise the interface to the profiling and tracing support for the
Fred Drake <fdrake@acm.org>
parents: 18293
diff changeset
130 static void call_exc_trace(Py_tracefunc, PyObject *, PyFrameObject *);
31872
9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most
Tim Peters <tim.peters@gmail.com>
parents: 31797
diff changeset
131 static int maybe_call_line_trace(Py_tracefunc, PyObject *,
62462
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
132 PyFrameObject *, int *, int *, int *);
24844
cf5928fab108 This is my patch
Michael W. Hudson <mwh@python.net>
parents: 24718
diff changeset
133
38453
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents: 37879
diff changeset
134 static PyObject * cmp_outcome(int, PyObject *, PyObject *);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents: 37879
diff changeset
135 static PyObject * import_from(PyObject *, PyObject *);
14038
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import
Thomas Wouters <thomas@python.org>
parents: 13930
diff changeset
136 static int import_all_from(PyObject *, PyObject *);
42860
bf1a53cc6e65 Use unicode
Neal Norwitz <nnorwitz@gmail.com>
parents: 42334
diff changeset
137 static void format_exc_check_arg(PyObject *, const char *, PyObject *);
64620
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
138 static void format_exc_unbound(PyCodeObject *co, int oparg);
72605
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
139 static PyObject * unicode_concatenate(PyObject *, PyObject *,
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
140 PyFrameObject *, unsigned char *);
74578
7d96679c5d46 use the static identifier api for looking up special methods
Benjamin Peterson <benjamin@python.org>
parents: 74367
diff changeset
141 static PyObject * special_lookup(PyObject *, _Py_Identifier *);
173
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
142
14268
cd8b815cb196 Better error message with UnboundLocalError
Paul Prescod <prescod@prescod.net>
parents: 14238
diff changeset
143 #define NAME_ERROR_MSG \
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
144 "name '%.200s' is not defined"
14268
cd8b815cb196 Better error message with UnboundLocalError
Paul Prescod <prescod@prescod.net>
parents: 14238
diff changeset
145 #define UNBOUNDLOCAL_ERROR_MSG \
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
146 "local variable '%.200s' referenced before assignment"
17494
a34293ced63b Change error message raised when free variable is not yet bound. It
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 17490
diff changeset
147 #define UNBOUNDFREE_ERROR_MSG \
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
148 "free variable '%.200s' referenced before assignment" \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
149 " in enclosing scope"
173
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
150
5049
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
151 /* Dynamic execution profile */
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
152 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
153 #ifdef DXPAIRS
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
154 static long dxpairs[257][256];
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
155 #define dxp dxpairs[256]
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
156 #else
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
157 static long dxp[256];
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
158 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
159 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
160
27712
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
161 /* Function call profile */
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
162 #ifdef CALL_PROFILE
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
163 #define PCALL_NUM 11
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
164 static int pcall[PCALL_NUM];
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
165
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
166 #define PCALL_ALL 0
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
167 #define PCALL_FUNCTION 1
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
168 #define PCALL_FAST_FUNCTION 2
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
169 #define PCALL_FASTER_FUNCTION 3
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
170 #define PCALL_METHOD 4
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
171 #define PCALL_BOUND_METHOD 5
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
172 #define PCALL_CFUNCTION 6
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
173 #define PCALL_TYPE 7
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
174 #define PCALL_GENERATOR 8
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
175 #define PCALL_OTHER 9
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
176 #define PCALL_POP 10
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
177
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
178 /* Notes about the statistics
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
179
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
180 PCALL_FAST stats
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
181
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
182 FAST_FUNCTION means no argument tuple needs to be created.
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
183 FASTER_FUNCTION means that the fast-path frame setup code is used.
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
184
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
185 If there is a method call where the call can be optimized by changing
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
186 the argument tuple and calling the function directly, it gets recorded
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
187 twice.
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
188
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
189 As a result, the relationship among the statistics appears to be
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
190 PCALL_ALL == PCALL_FUNCTION + PCALL_METHOD - PCALL_BOUND_METHOD +
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
191 PCALL_CFUNCTION + PCALL_TYPE + PCALL_GENERATOR + PCALL_OTHER
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
192 PCALL_FUNCTION > PCALL_FAST_FUNCTION > PCALL_FASTER_FUNCTION
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
193 PCALL_METHOD > PCALL_BOUND_METHOD
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
194 */
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
195
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
196 #define PCALL(POS) pcall[POS]++
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
197
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
198 PyObject *
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
199 PyEval_GetCallStats(PyObject *self)
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
200 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
201 return Py_BuildValue("iiiiiiiiiii",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
202 pcall[0], pcall[1], pcall[2], pcall[3],
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
203 pcall[4], pcall[5], pcall[6], pcall[7],
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
204 pcall[8], pcall[9], pcall[10]);
27712
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
205 }
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
206 #else
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
207 #define PCALL(O)
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
208
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
209 PyObject *
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
210 PyEval_GetCallStats(PyObject *self)
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
211 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
212 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
213 return Py_None;
27712
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
214 }
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
215 #endif
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
216
18148
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay!
Tim Peters <tim.peters@gmail.com>
parents: 18136
diff changeset
217
1846
5243fb187d36 call_object: print message before abort()
Guido van Rossum <guido@python.org>
parents: 1425
diff changeset
218 #ifdef WITH_THREAD
64628
56844b716cd7 remove gil_drop_request in --without-threads
Benjamin Peterson <benjamin@python.org>
parents: 64624
diff changeset
219 #define GIL_REQUEST _Py_atomic_load_relaxed(&gil_drop_request)
56844b716cd7 remove gil_drop_request in --without-threads
Benjamin Peterson <benjamin@python.org>
parents: 64624
diff changeset
220 #else
56844b716cd7 remove gil_drop_request in --without-threads
Benjamin Peterson <benjamin@python.org>
parents: 64624
diff changeset
221 #define GIL_REQUEST 0
56844b716cd7 remove gil_drop_request in --without-threads
Benjamin Peterson <benjamin@python.org>
parents: 64624
diff changeset
222 #endif
56844b716cd7 remove gil_drop_request in --without-threads
Benjamin Peterson <benjamin@python.org>
parents: 64624
diff changeset
223
61184
4fd3ab5fa71d Make (most of) Python's tests pass under Thread Sanitizer.
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 60130
diff changeset
224 /* This can set eval_breaker to 0 even though gil_drop_request became
4fd3ab5fa71d Make (most of) Python's tests pass under Thread Sanitizer.
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 60130
diff changeset
225 1. We believe this is all right because the eval loop will release
4fd3ab5fa71d Make (most of) Python's tests pass under Thread Sanitizer.
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 60130
diff changeset
226 the GIL eventually anyway. */
57175
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
227 #define COMPUTE_EVAL_BREAKER() \
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
228 _Py_atomic_store_relaxed( \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
229 &eval_breaker, \
64628
56844b716cd7 remove gil_drop_request in --without-threads
Benjamin Peterson <benjamin@python.org>
parents: 64624
diff changeset
230 GIL_REQUEST | \
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
231 _Py_atomic_load_relaxed(&pendingcalls_to_do) | \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
232 pending_async_exc)
57175
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
233
64628
56844b716cd7 remove gil_drop_request in --without-threads
Benjamin Peterson <benjamin@python.org>
parents: 64624
diff changeset
234 #ifdef WITH_THREAD
56844b716cd7 remove gil_drop_request in --without-threads
Benjamin Peterson <benjamin@python.org>
parents: 64624
diff changeset
235
57175
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
236 #define SET_GIL_DROP_REQUEST() \
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
237 do { \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
238 _Py_atomic_store_relaxed(&gil_drop_request, 1); \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
239 _Py_atomic_store_relaxed(&eval_breaker, 1); \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
240 } while (0)
57175
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
241
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
242 #define RESET_GIL_DROP_REQUEST() \
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
243 do { \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
244 _Py_atomic_store_relaxed(&gil_drop_request, 0); \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
245 COMPUTE_EVAL_BREAKER(); \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
246 } while (0)
61184
4fd3ab5fa71d Make (most of) Python's tests pass under Thread Sanitizer.
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 60130
diff changeset
247
64628
56844b716cd7 remove gil_drop_request in --without-threads
Benjamin Peterson <benjamin@python.org>
parents: 64624
diff changeset
248 #endif
56844b716cd7 remove gil_drop_request in --without-threads
Benjamin Peterson <benjamin@python.org>
parents: 64624
diff changeset
249
61184
4fd3ab5fa71d Make (most of) Python's tests pass under Thread Sanitizer.
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 60130
diff changeset
250 /* Pending calls are only modified under pending_lock */
57175
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
251 #define SIGNAL_PENDING_CALLS() \
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
252 do { \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
253 _Py_atomic_store_relaxed(&pendingcalls_to_do, 1); \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
254 _Py_atomic_store_relaxed(&eval_breaker, 1); \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
255 } while (0)
57175
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
256
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
257 #define UNSIGNAL_PENDING_CALLS() \
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
258 do { \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
259 _Py_atomic_store_relaxed(&pendingcalls_to_do, 0); \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
260 COMPUTE_EVAL_BREAKER(); \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
261 } while (0)
57175
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
262
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
263 #define SIGNAL_ASYNC_EXC() \
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
264 do { \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
265 pending_async_exc = 1; \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
266 _Py_atomic_store_relaxed(&eval_breaker, 1); \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
267 } while (0)
57175
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
268
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
269 #define UNSIGNAL_ASYNC_EXC() \
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
270 do { pending_async_exc = 0; COMPUTE_EVAL_BREAKER(); } while (0)
57175
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
271
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
272
1846
5243fb187d36 call_object: print message before abort()
Guido van Rossum <guido@python.org>
parents: 1425
diff changeset
273 #ifdef WITH_THREAD
923
72aceed365d4 * Makefile adapted to changes below.
Guido van Rossum <guido@python.org>
parents: 815
diff changeset
274
39442
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents: 39222
diff changeset
275 #ifdef HAVE_ERRNO_H
923
72aceed365d4 * Makefile adapted to changes below.
Guido van Rossum <guido@python.org>
parents: 815
diff changeset
276 #include <errno.h>
10530
d834ecdf8c26 Changes by Mark Hammond for Windows CE. Mostly of the form
Guido van Rossum <guido@python.org>
parents: 10363
diff changeset
277 #endif
9203
07dae6fdae79 Renamed thread.h to pythread.h.
Guido van Rossum <guido@python.org>
parents: 9048
diff changeset
278 #include "pythread.h"
926
c156d4960c2b * Makefile: cosmetics
Guido van Rossum <guido@python.org>
parents: 923
diff changeset
279
50839
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
280 static PyThread_type_lock pending_lock = 0; /* for pending calls */
1887
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
281 static long main_thread = 0;
57175
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
282 /* This single variable consolidates all requests to break out of the fast path
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
283 in the eval loop. */
61184
4fd3ab5fa71d Make (most of) Python's tests pass under Thread Sanitizer.
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 60130
diff changeset
284 static _Py_atomic_int eval_breaker = {0};
4fd3ab5fa71d Make (most of) Python's tests pass under Thread Sanitizer.
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 60130
diff changeset
285 /* Request for dropping the GIL */
4fd3ab5fa71d Make (most of) Python's tests pass under Thread Sanitizer.
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 60130
diff changeset
286 static _Py_atomic_int gil_drop_request = {0};
4fd3ab5fa71d Make (most of) Python's tests pass under Thread Sanitizer.
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 60130
diff changeset
287 /* Request for running pending calls. */
4fd3ab5fa71d Make (most of) Python's tests pass under Thread Sanitizer.
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 60130
diff changeset
288 static _Py_atomic_int pendingcalls_to_do = {0};
4fd3ab5fa71d Make (most of) Python's tests pass under Thread Sanitizer.
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 60130
diff changeset
289 /* Request for looking at the `async_exc` field of the current thread state.
4fd3ab5fa71d Make (most of) Python's tests pass under Thread Sanitizer.
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 60130
diff changeset
290 Guarded by the GIL. */
4fd3ab5fa71d Make (most of) Python's tests pass under Thread Sanitizer.
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 60130
diff changeset
291 static int pending_async_exc = 0;
57175
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
292
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
293 #include "ceval_gil.h"
923
72aceed365d4 * Makefile adapted to changes below.
Guido van Rossum <guido@python.org>
parents: 815
diff changeset
294
33715
a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick
Tim Peters <tim.peters@gmail.com>
parents: 33501
diff changeset
295 int
a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick
Tim Peters <tim.peters@gmail.com>
parents: 33501
diff changeset
296 PyEval_ThreadsInitialized(void)
a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick
Tim Peters <tim.peters@gmail.com>
parents: 33501
diff changeset
297 {
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
298 return gil_created();
33715
a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick
Tim Peters <tim.peters@gmail.com>
parents: 33501
diff changeset
299 }
a46b76eb9053 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick
Tim Peters <tim.peters@gmail.com>
parents: 33501
diff changeset
300
923
72aceed365d4 * Makefile adapted to changes below.
Guido van Rossum <guido@python.org>
parents: 815
diff changeset
301 void
13658
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents: 13620
diff changeset
302 PyEval_InitThreads(void)
923
72aceed365d4 * Makefile adapted to changes below.
Guido van Rossum <guido@python.org>
parents: 815
diff changeset
303 {
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
304 if (gil_created())
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
305 return;
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
306 create_gil();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
307 take_gil(PyThreadState_GET());
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
308 main_thread = PyThread_get_thread_ident();
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
309 if (!pending_lock)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
310 pending_lock = PyThread_allocate_lock();
926
c156d4960c2b * Makefile: cosmetics
Guido van Rossum <guido@python.org>
parents: 923
diff changeset
311 }
c156d4960c2b * Makefile: cosmetics
Guido van Rossum <guido@python.org>
parents: 923
diff changeset
312
5865
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef
Guido van Rossum <guido@python.org>
parents: 5846
diff changeset
313 void
64709
557e2537c9ae Issue #9828: Destroy the GIL in Py_Finalize(), so that it gets properly
Antoine Pitrou <solipsis@pitrou.net>
parents: 64634
diff changeset
314 _PyEval_FiniThreads(void)
557e2537c9ae Issue #9828: Destroy the GIL in Py_Finalize(), so that it gets properly
Antoine Pitrou <solipsis@pitrou.net>
parents: 64634
diff changeset
315 {
557e2537c9ae Issue #9828: Destroy the GIL in Py_Finalize(), so that it gets properly
Antoine Pitrou <solipsis@pitrou.net>
parents: 64634
diff changeset
316 if (!gil_created())
557e2537c9ae Issue #9828: Destroy the GIL in Py_Finalize(), so that it gets properly
Antoine Pitrou <solipsis@pitrou.net>
parents: 64634
diff changeset
317 return;
557e2537c9ae Issue #9828: Destroy the GIL in Py_Finalize(), so that it gets properly
Antoine Pitrou <solipsis@pitrou.net>
parents: 64634
diff changeset
318 destroy_gil();
557e2537c9ae Issue #9828: Destroy the GIL in Py_Finalize(), so that it gets properly
Antoine Pitrou <solipsis@pitrou.net>
parents: 64634
diff changeset
319 assert(!gil_created());
926
c156d4960c2b * Makefile: cosmetics
Guido van Rossum <guido@python.org>
parents: 923
diff changeset
320 }
c156d4960c2b * Makefile: cosmetics
Guido van Rossum <guido@python.org>
parents: 923
diff changeset
321
5865
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef
Guido van Rossum <guido@python.org>
parents: 5846
diff changeset
322 void
13658
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents: 13620
diff changeset
323 PyEval_AcquireLock(void)
5926
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters.
Guido van Rossum <guido@python.org>
parents: 5911
diff changeset
324 {
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
325 PyThreadState *tstate = PyThreadState_GET();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
326 if (tstate == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
327 Py_FatalError("PyEval_AcquireLock: current thread state is NULL");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
328 take_gil(tstate);
5926
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters.
Guido van Rossum <guido@python.org>
parents: 5911
diff changeset
329 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters.
Guido van Rossum <guido@python.org>
parents: 5911
diff changeset
330
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters.
Guido van Rossum <guido@python.org>
parents: 5911
diff changeset
331 void
13658
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents: 13620
diff changeset
332 PyEval_ReleaseLock(void)
5926
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters.
Guido van Rossum <guido@python.org>
parents: 5911
diff changeset
333 {
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
334 /* This function must succeed when the current thread state is NULL.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
335 We therefore avoid PyThreadState_GET() which dumps a fatal error
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
336 in debug mode.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
337 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
338 drop_gil((PyThreadState*)_Py_atomic_load_relaxed(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
339 &_PyThreadState_Current));
5926
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters.
Guido van Rossum <guido@python.org>
parents: 5911
diff changeset
340 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters.
Guido van Rossum <guido@python.org>
parents: 5911
diff changeset
341
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters.
Guido van Rossum <guido@python.org>
parents: 5911
diff changeset
342 void
13658
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents: 13620
diff changeset
343 PyEval_AcquireThread(PyThreadState *tstate)
5865
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef
Guido van Rossum <guido@python.org>
parents: 5846
diff changeset
344 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
345 if (tstate == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
346 Py_FatalError("PyEval_AcquireThread: NULL new thread state");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
347 /* Check someone has called PyEval_InitThreads() to create the lock */
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
348 assert(gil_created());
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
349 take_gil(tstate);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
350 if (PyThreadState_Swap(tstate) != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
351 Py_FatalError(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
352 "PyEval_AcquireThread: non-NULL old thread state");
5865
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef
Guido van Rossum <guido@python.org>
parents: 5846
diff changeset
353 }
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef
Guido van Rossum <guido@python.org>
parents: 5846
diff changeset
354
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef
Guido van Rossum <guido@python.org>
parents: 5846
diff changeset
355 void
13658
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents: 13620
diff changeset
356 PyEval_ReleaseThread(PyThreadState *tstate)
5865
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef
Guido van Rossum <guido@python.org>
parents: 5846
diff changeset
357 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
358 if (tstate == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
359 Py_FatalError("PyEval_ReleaseThread: NULL thread state");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
360 if (PyThreadState_Swap(NULL) != tstate)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
361 Py_FatalError("PyEval_ReleaseThread: wrong thread state");
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
362 drop_gil(tstate);
5865
9841bce37c4d Moved PyEval_{Acquire,Release}Thread() to within the same #ifdef
Guido van Rossum <guido@python.org>
parents: 5846
diff changeset
363 }
14225
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a
Guido van Rossum <guido@python.org>
parents: 14163
diff changeset
364
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a
Guido van Rossum <guido@python.org>
parents: 14163
diff changeset
365 /* This function is called from PyOS_AfterFork to ensure that newly
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a
Guido van Rossum <guido@python.org>
parents: 14163
diff changeset
366 created child processes don't hold locks referring to threads which
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a
Guido van Rossum <guido@python.org>
parents: 14163
diff changeset
367 are not running in the child process. (This could also be done using
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a
Guido van Rossum <guido@python.org>
parents: 14163
diff changeset
368 pthread_atfork mechanism, at least for the pthreads implementation.) */
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a
Guido van Rossum <guido@python.org>
parents: 14163
diff changeset
369
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a
Guido van Rossum <guido@python.org>
parents: 14163
diff changeset
370 void
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a
Guido van Rossum <guido@python.org>
parents: 14163
diff changeset
371 PyEval_ReInitThreads(void)
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a
Guido van Rossum <guido@python.org>
parents: 14163
diff changeset
372 {
72925
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER.
Martin v. Löwis <martin@v.loewis.de>
parents: 72835
diff changeset
373 _Py_IDENTIFIER(_after_fork);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
374 PyObject *threading, *result;
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
375 PyThreadState *tstate = PyThreadState_GET();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
376
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
377 if (!gil_created())
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
378 return;
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
379 recreate_gil();
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
380 pending_lock = PyThread_allocate_lock();
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
381 take_gil(tstate);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
382 main_thread = PyThread_get_thread_ident();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
383
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
384 /* Update the threading module with the new state.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
385 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
386 tstate = PyThreadState_GET();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
387 threading = PyMapping_GetItemString(tstate->interp->modules,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
388 "threading");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
389 if (threading == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
390 /* threading not imported */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
391 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
392 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
393 }
72835
5e33219492bc Add API for static strings, primarily good for identifiers.
Martin v. Löwis <martin@v.loewis.de>
parents: 72605
diff changeset
394 result = _PyObject_CallMethodId(threading, &PyId__after_fork, NULL);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
395 if (result == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
396 PyErr_WriteUnraisable(threading);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
397 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
398 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
399 Py_DECREF(threading);
14225
cbe9590d2344 Charles Waldman's patch to reinitialize the interpreter lock after a
Guido van Rossum <guido@python.org>
parents: 14163
diff changeset
400 }
57175
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
401
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
402 #else
61184
4fd3ab5fa71d Make (most of) Python's tests pass under Thread Sanitizer.
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 60130
diff changeset
403 static _Py_atomic_int eval_breaker = {0};
57175
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
404 static int pending_async_exc = 0;
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
405 #endif /* WITH_THREAD */
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
406
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
407 /* This function is used to signal that async exceptions are waiting to be
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
408 raised, therefore it is also useful in non-threaded builds. */
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
409
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
410 void
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
411 _PyEval_SignalAsyncExc(void)
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
412 {
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
413 SIGNAL_ASYNC_EXC();
57175
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
414 }
926
c156d4960c2b * Makefile: cosmetics
Guido van Rossum <guido@python.org>
parents: 923
diff changeset
415
c156d4960c2b * Makefile: cosmetics
Guido van Rossum <guido@python.org>
parents: 923
diff changeset
416 /* Functions save_thread and restore_thread are always defined so
c156d4960c2b * Makefile: cosmetics
Guido van Rossum <guido@python.org>
parents: 923
diff changeset
417 dynamically loaded modules needn't be compiled separately for use
c156d4960c2b * Makefile: cosmetics
Guido van Rossum <guido@python.org>
parents: 923
diff changeset
418 with and without threads: */
923
72aceed365d4 * Makefile adapted to changes below.
Guido van Rossum <guido@python.org>
parents: 815
diff changeset
419
5846
852a1fa62a7c PyEval_SaveThread() and PyEval_RestoreThread() now return/take a
Guido van Rossum <guido@python.org>
parents: 5829
diff changeset
420 PyThreadState *
13658
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents: 13620
diff changeset
421 PyEval_SaveThread(void)
923
72aceed365d4 * Makefile adapted to changes below.
Guido van Rossum <guido@python.org>
parents: 815
diff changeset
422 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
423 PyThreadState *tstate = PyThreadState_Swap(NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
424 if (tstate == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
425 Py_FatalError("PyEval_SaveThread: NULL tstate");
1846
5243fb187d36 call_object: print message before abort()
Guido van Rossum <guido@python.org>
parents: 1425
diff changeset
426 #ifdef WITH_THREAD
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
427 if (gil_created())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
428 drop_gil(tstate);
923
72aceed365d4 * Makefile adapted to changes below.
Guido van Rossum <guido@python.org>
parents: 815
diff changeset
429 #endif
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
430 return tstate;
923
72aceed365d4 * Makefile adapted to changes below.
Guido van Rossum <guido@python.org>
parents: 815
diff changeset
431 }
72aceed365d4 * Makefile adapted to changes below.
Guido van Rossum <guido@python.org>
parents: 815
diff changeset
432
72aceed365d4 * Makefile adapted to changes below.
Guido van Rossum <guido@python.org>
parents: 815
diff changeset
433 void
13658
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents: 13620
diff changeset
434 PyEval_RestoreThread(PyThreadState *tstate)
923
72aceed365d4 * Makefile adapted to changes below.
Guido van Rossum <guido@python.org>
parents: 815
diff changeset
435 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
436 if (tstate == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
437 Py_FatalError("PyEval_RestoreThread: NULL tstate");
1846
5243fb187d36 call_object: print message before abort()
Guido van Rossum <guido@python.org>
parents: 1425
diff changeset
438 #ifdef WITH_THREAD
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
439 if (gil_created()) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
440 int err = errno;
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
441 take_gil(tstate);
69832
2a19d09b08f8 Issue #1856: Avoid crashes and lockups when daemon threads run while the
Antoine Pitrou <solipsis@pitrou.net>
parents: 68586
diff changeset
442 /* _Py_Finalizing is protected by the GIL */
2a19d09b08f8 Issue #1856: Avoid crashes and lockups when daemon threads run while the
Antoine Pitrou <solipsis@pitrou.net>
parents: 68586
diff changeset
443 if (_Py_Finalizing && tstate != _Py_Finalizing) {
2a19d09b08f8 Issue #1856: Avoid crashes and lockups when daemon threads run while the
Antoine Pitrou <solipsis@pitrou.net>
parents: 68586
diff changeset
444 drop_gil(tstate);
2a19d09b08f8 Issue #1856: Avoid crashes and lockups when daemon threads run while the
Antoine Pitrou <solipsis@pitrou.net>
parents: 68586
diff changeset
445 PyThread_exit_thread();
2a19d09b08f8 Issue #1856: Avoid crashes and lockups when daemon threads run while the
Antoine Pitrou <solipsis@pitrou.net>
parents: 68586
diff changeset
446 assert(0); /* unreachable */
2a19d09b08f8 Issue #1856: Avoid crashes and lockups when daemon threads run while the
Antoine Pitrou <solipsis@pitrou.net>
parents: 68586
diff changeset
447 }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
448 errno = err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
449 }
923
72aceed365d4 * Makefile adapted to changes below.
Guido van Rossum <guido@python.org>
parents: 815
diff changeset
450 #endif
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
451 PyThreadState_Swap(tstate);
923
72aceed365d4 * Makefile adapted to changes below.
Guido van Rossum <guido@python.org>
parents: 815
diff changeset
452 }
72aceed365d4 * Makefile adapted to changes below.
Guido van Rossum <guido@python.org>
parents: 815
diff changeset
453
72aceed365d4 * Makefile adapted to changes below.
Guido van Rossum <guido@python.org>
parents: 815
diff changeset
454
1887
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
455 /* Mechanism whereby asynchronously executing callbacks (e.g. UNIX
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
456 signal handlers or Mac I/O completion routines) can schedule calls
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
457 to a function to be called synchronously.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
458 The synchronous function is called with one void* argument.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
459 It should return 0 for success or -1 for failure -- failure should
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
460 be accompanied by an exception.
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
461
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
462 If registry succeeds, the registry function returns 0; if it fails
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
463 (e.g. due to too many pending calls) it returns -1 (without setting
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
464 an exception condition).
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
465
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
466 Note that because registry may occur from within signal handlers,
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
467 or other asynchronous events, calling malloc() is unsafe!
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
468
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
469 #ifdef WITH_THREAD
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
470 Any thread can schedule pending calls, but only the main thread
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
471 will execute them.
50839
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
472 There is no facility to schedule calls to a particular thread, but
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
473 that should be easy to change, should that ever be required. In
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
474 that case, the static variables here should go into the python
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
475 threadstate.
1887
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
476 #endif
50839
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
477 */
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
478
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
479 #ifdef WITH_THREAD
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
480
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
481 /* The WITH_THREAD implementation is thread-safe. It allows
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
482 scheduling to be made from any thread, and even from an executing
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
483 callback.
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
484 */
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
485
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
486 #define NPENDINGCALLS 32
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
487 static struct {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
488 int (*func)(void *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
489 void *arg;
50839
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
490 } pendingcalls[NPENDINGCALLS];
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
491 static int pendingfirst = 0;
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
492 static int pendinglast = 0;
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
493
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
494 int
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
495 Py_AddPendingCall(int (*func)(void *), void *arg)
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
496 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
497 int i, j, result=0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
498 PyThread_type_lock lock = pending_lock;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
499
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
500 /* try a few times for the lock. Since this mechanism is used
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
501 * for signal handling (on the main thread), there is a (slim)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
502 * chance that a signal is delivered on the same thread while we
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
503 * hold the lock during the Py_MakePendingCalls() function.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
504 * This avoids a deadlock in that case.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
505 * Note that signals can be delivered on any thread. In particular,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
506 * on Windows, a SIGINT is delivered on a system-created worker
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
507 * thread.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
508 * We also check for lock being NULL, in the unlikely case that
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
509 * this function is called before any bytecode evaluation takes place.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
510 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
511 if (lock != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
512 for (i = 0; i<100; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
513 if (PyThread_acquire_lock(lock, NOWAIT_LOCK))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
514 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
515 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
516 if (i == 100)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
517 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
518 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
519
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
520 i = pendinglast;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
521 j = (i + 1) % NPENDINGCALLS;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
522 if (j == pendingfirst) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
523 result = -1; /* Queue full */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
524 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
525 pendingcalls[i].func = func;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
526 pendingcalls[i].arg = arg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
527 pendinglast = j;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
528 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
529 /* signal main loop */
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
530 SIGNAL_PENDING_CALLS();
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
531 if (lock != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
532 PyThread_release_lock(lock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
533 return result;
50839
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
534 }
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
535
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
536 int
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
537 Py_MakePendingCalls(void)
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
538 {
71481
cda93720c06d Issue 12620: Make pendingbusy flag static to Py_MakePendingCalls().
Charles-François Natali <neologix@free.fr>
parents: 71402
diff changeset
539 static int busy = 0;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
540 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
541 int r = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
542
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
543 if (!pending_lock) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
544 /* initial allocation of the lock */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
545 pending_lock = PyThread_allocate_lock();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
546 if (pending_lock == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
547 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
548 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
549
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
550 /* only service pending calls on main thread */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
551 if (main_thread && PyThread_get_thread_ident() != main_thread)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
552 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
553 /* don't perform recursive pending calls */
71481
cda93720c06d Issue 12620: Make pendingbusy flag static to Py_MakePendingCalls().
Charles-François Natali <neologix@free.fr>
parents: 71402
diff changeset
554 if (busy)
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
555 return 0;
71481
cda93720c06d Issue 12620: Make pendingbusy flag static to Py_MakePendingCalls().
Charles-François Natali <neologix@free.fr>
parents: 71402
diff changeset
556 busy = 1;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
557 /* perform a bounded number of calls, in case of recursion */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
558 for (i=0; i<NPENDINGCALLS; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
559 int j;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
560 int (*func)(void *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
561 void *arg = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
562
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
563 /* pop one item off the queue while holding the lock */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
564 PyThread_acquire_lock(pending_lock, WAIT_LOCK);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
565 j = pendingfirst;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
566 if (j == pendinglast) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
567 func = NULL; /* Queue empty */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
568 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
569 func = pendingcalls[j].func;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
570 arg = pendingcalls[j].arg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
571 pendingfirst = (j + 1) % NPENDINGCALLS;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
572 }
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
573 if (pendingfirst != pendinglast)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
574 SIGNAL_PENDING_CALLS();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
575 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
576 UNSIGNAL_PENDING_CALLS();
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
577 PyThread_release_lock(pending_lock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
578 /* having released the lock, perform the callback */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
579 if (func == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
580 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
581 r = func(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
582 if (r)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
583 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
584 }
71481
cda93720c06d Issue 12620: Make pendingbusy flag static to Py_MakePendingCalls().
Charles-François Natali <neologix@free.fr>
parents: 71402
diff changeset
585 busy = 0;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
586 return r;
50839
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
587 }
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
588
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
589 #else /* if ! defined WITH_THREAD */
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
590
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
591 /*
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
592 WARNING! ASYNCHRONOUSLY EXECUTING CODE!
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
593 This code is used for signal handling in python that isn't built
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
594 with WITH_THREAD.
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
595 Don't use this implementation when Py_AddPendingCalls() can happen
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
596 on a different thread!
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
597
1887
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
598 There are two possible race conditions:
50839
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
599 (1) nested asynchronous calls to Py_AddPendingCall()
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
600 (2) AddPendingCall() calls made while pending calls are being processed.
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
601
50839
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
602 (1) is very unlikely because typically signal delivery
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
603 is blocked during signal handling. So it should be impossible.
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
604 (2) is a real possibility.
1887
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
605 The current code is safe against (2), but not against (1).
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
606 The safety against (2) is derived from the fact that only one
50839
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
607 thread is present, interrupted by signals, and that the critical
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
608 section is protected with the "busy" variable. On Windows, which
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
609 delivers SIGINT on a system thread, this does not hold and therefore
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
610 Windows really shouldn't use this version.
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
611 The two threads could theoretically wiggle around the "busy" variable.
1887
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
612 */
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
613
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
614 #define NPENDINGCALLS 32
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
615 static struct {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
616 int (*func)(void *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
617 void *arg;
1887
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
618 } pendingcalls[NPENDINGCALLS];
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
619 static volatile int pendingfirst = 0;
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
620 static volatile int pendinglast = 0;
61993
e766c0d86cff use atomic structures in non-thread version
Benjamin Peterson <benjamin@python.org>
parents: 61466
diff changeset
621 static _Py_atomic_int pendingcalls_to_do = {0};
1887
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
622
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
623 int
13709
4e2aaf1e722a Use 'void' directly instead of the ANY #define, now that all code is ANSI C.
Thomas Wouters <thomas@python.org>
parents: 13658
diff changeset
624 Py_AddPendingCall(int (*func)(void *), void *arg)
1887
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
625 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
626 static volatile int busy = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
627 int i, j;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
628 /* XXX Begin critical section */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
629 if (busy)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
630 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
631 busy = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
632 i = pendinglast;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
633 j = (i + 1) % NPENDINGCALLS;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
634 if (j == pendingfirst) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
635 busy = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
636 return -1; /* Queue full */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
637 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
638 pendingcalls[i].func = func;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
639 pendingcalls[i].arg = arg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
640 pendinglast = j;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
641
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
642 SIGNAL_PENDING_CALLS();
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
643 busy = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
644 /* XXX End critical section */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
645 return 0;
1887
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
646 }
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
647
1914
893412101296 * Python/ceval.c, Include/ceval.h: promote MakePendingCalls to
Guido van Rossum <guido@python.org>
parents: 1887
diff changeset
648 int
13658
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents: 13620
diff changeset
649 Py_MakePendingCalls(void)
1887
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
650 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
651 static int busy = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
652 if (busy)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
653 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
654 busy = 1;
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
655 UNSIGNAL_PENDING_CALLS();
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
656 for (;;) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
657 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
658 int (*func)(void *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
659 void *arg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
660 i = pendingfirst;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
661 if (i == pendinglast)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
662 break; /* Queue empty */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
663 func = pendingcalls[i].func;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
664 arg = pendingcalls[i].arg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
665 pendingfirst = (i + 1) % NPENDINGCALLS;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
666 if (func(arg) < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
667 busy = 0;
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
668 SIGNAL_PENDING_CALLS(); /* We're not done yet */
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
669 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
670 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
671 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
672 busy = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
673 return 0;
1887
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
674 }
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
675
50839
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
676 #endif /* WITH_THREAD */
75009d4863c9 Merged revisions 68460 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50211
diff changeset
677
1887
e7c6a18381d9 * Python/ceval.c (eval_code): added registry of pending functions
Guido van Rossum <guido@python.org>
parents: 1846
diff changeset
678
14308
b8b3f76ffd51 add user-modifiable recursion_limit
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 14268
diff changeset
679 /* The interpreter's recursion limit */
b8b3f76ffd51 add user-modifiable recursion_limit
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 14268
diff changeset
680
34863
71fd7ee4b7f5 Make a handy macro, Py_DEFAULT_RECURSION_LIMIT to allow to define
Hye-Shik Chang <hyeshik@gmail.com>
parents: 34442
diff changeset
681 #ifndef Py_DEFAULT_RECURSION_LIMIT
71fd7ee4b7f5 Make a handy macro, Py_DEFAULT_RECURSION_LIMIT to allow to define
Hye-Shik Chang <hyeshik@gmail.com>
parents: 34442
diff changeset
682 #define Py_DEFAULT_RECURSION_LIMIT 1000
71fd7ee4b7f5 Make a handy macro, Py_DEFAULT_RECURSION_LIMIT to allow to define
Hye-Shik Chang <hyeshik@gmail.com>
parents: 34442
diff changeset
683 #endif
71fd7ee4b7f5 Make a handy macro, Py_DEFAULT_RECURSION_LIMIT to allow to define
Hye-Shik Chang <hyeshik@gmail.com>
parents: 34442
diff changeset
684 static int recursion_limit = Py_DEFAULT_RECURSION_LIMIT;
71fd7ee4b7f5 Make a handy macro, Py_DEFAULT_RECURSION_LIMIT to allow to define
Hye-Shik Chang <hyeshik@gmail.com>
parents: 34442
diff changeset
685 int _Py_CheckRecursionLimit = Py_DEFAULT_RECURSION_LIMIT;
14308
b8b3f76ffd51 add user-modifiable recursion_limit
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 14268
diff changeset
686
14348
6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide)
Vladimir Marangozov <vladimir.marangozov@t-online.de>
parents: 14333
diff changeset
687 int
6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide)
Vladimir Marangozov <vladimir.marangozov@t-online.de>
parents: 14333
diff changeset
688 Py_GetRecursionLimit(void)
14308
b8b3f76ffd51 add user-modifiable recursion_limit
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 14268
diff changeset
689 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
690 return recursion_limit;
14308
b8b3f76ffd51 add user-modifiable recursion_limit
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 14268
diff changeset
691 }
b8b3f76ffd51 add user-modifiable recursion_limit
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 14268
diff changeset
692
14348
6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide)
Vladimir Marangozov <vladimir.marangozov@t-online.de>
parents: 14333
diff changeset
693 void
6d0f64f7dedd Cosmetics on Py_Get/SetRecursionLimit (for the style guide)
Vladimir Marangozov <vladimir.marangozov@t-online.de>
parents: 14333
diff changeset
694 Py_SetRecursionLimit(int new_limit)
14308
b8b3f76ffd51 add user-modifiable recursion_limit
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 14268
diff changeset
695 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
696 recursion_limit = new_limit;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
697 _Py_CheckRecursionLimit = recursion_limit;
14308
b8b3f76ffd51 add user-modifiable recursion_limit
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 14268
diff changeset
698 }
b8b3f76ffd51 add user-modifiable recursion_limit
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 14268
diff changeset
699
30801
c42c40034536 Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents: 30782
diff changeset
700 /* the macro Py_EnterRecursiveCall() only calls _Py_CheckRecursiveCall()
c42c40034536 Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents: 30782
diff changeset
701 if the recursion_depth reaches _Py_CheckRecursionLimit.
c42c40034536 Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents: 30782
diff changeset
702 If USE_STACKCHECK, the macro decrements _Py_CheckRecursionLimit
c42c40034536 Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents: 30782
diff changeset
703 to guarantee that _Py_CheckRecursiveCall() is regularly called.
c42c40034536 Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents: 30782
diff changeset
704 Without USE_STACKCHECK, there is no need for this. */
c42c40034536 Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents: 30782
diff changeset
705 int
c42c40034536 Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents: 30782
diff changeset
706 _Py_CheckRecursiveCall(char *where)
c42c40034536 Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents: 30782
diff changeset
707 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
708 PyThreadState *tstate = PyThreadState_GET();
30801
c42c40034536 Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents: 30782
diff changeset
709
c42c40034536 Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents: 30782
diff changeset
710 #ifdef USE_STACKCHECK
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
711 if (PyOS_CheckStack()) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
712 --tstate->recursion_depth;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
713 PyErr_SetString(PyExc_MemoryError, "Stack overflow");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
714 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
715 }
30801
c42c40034536 Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents: 30782
diff changeset
716 #endif
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
717 _Py_CheckRecursionLimit = recursion_limit;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
718 if (tstate->recursion_critical)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
719 /* Somebody asked that we don't check for recursion. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
720 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
721 if (tstate->overflowed) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
722 if (tstate->recursion_depth > recursion_limit + 50) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
723 /* Overflowing while handling an overflow. Give up. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
724 Py_FatalError("Cannot recover from stack overflow.");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
725 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
726 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
727 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
728 if (tstate->recursion_depth > recursion_limit) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
729 --tstate->recursion_depth;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
730 tstate->overflowed = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
731 PyErr_Format(PyExc_RuntimeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
732 "maximum recursion depth exceeded%s",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
733 where);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
734 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
735 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
736 return 0;
30801
c42c40034536 Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents: 30782
diff changeset
737 }
c42c40034536 Deleting cyclic object comparison.
Armin Rigo <arigo@tunes.org>
parents: 30782
diff changeset
738
173
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
739 /* Status code for main loop (reason for stack unwind) */
31875
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes).
Raymond Hettinger <python@rcn.com>
parents: 31874
diff changeset
740 enum why_code {
62462
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
741 WHY_NOT = 0x0001, /* No error */
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
742 WHY_EXCEPTION = 0x0002, /* Exception occurred */
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
743 WHY_RETURN = 0x0008, /* 'return' statement */
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
744 WHY_BREAK = 0x0010, /* 'break' statement */
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
745 WHY_CONTINUE = 0x0020, /* 'continue' statement */
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
746 WHY_YIELD = 0x0040, /* 'yield' operator */
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
747 WHY_SILENCED = 0x0080 /* Exception silenced by 'with' */
31875
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes).
Raymond Hettinger <python@rcn.com>
parents: 31874
diff changeset
748 };
1fb2313ac3ce Simplify previous checkin (bitfields for WHY codes).
Raymond Hettinger <python@rcn.com>
parents: 31874
diff changeset
749
71159
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
750 static void save_exc_state(PyThreadState *, PyFrameObject *);
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
751 static void swap_exc_state(PyThreadState *, PyFrameObject *);
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
752 static void restore_and_clear_exc_state(PyThreadState *, PyFrameObject *);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
753 static int do_raise(PyObject *, PyObject *);
41699
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from
Guido van Rossum <guido@python.org>
parents: 41558
diff changeset
754 static int unpack_iterable(PyObject *, int, int, PyObject **);
5018
001a5042b181 Cleanup:
Guido van Rossum <guido@python.org>
parents: 5014
diff changeset
755
50045
ba8fe3a40a5b Merged revisions 67494 via svnmerge from
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 48986
diff changeset
756 /* Records whether tracing is on for any thread. Counts the number of
ba8fe3a40a5b Merged revisions 67494 via svnmerge from
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 48986
diff changeset
757 threads for which tstate->c_tracefunc is non-NULL, so if the value
ba8fe3a40a5b Merged revisions 67494 via svnmerge from
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 48986
diff changeset
758 is 0, we know we don't have to check this thread's c_tracefunc.
ba8fe3a40a5b Merged revisions 67494 via svnmerge from
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 48986
diff changeset
759 This speeds up the if statement in PyEval_EvalFrameEx() after
ba8fe3a40a5b Merged revisions 67494 via svnmerge from
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 48986
diff changeset
760 fast_next_opcode*/
ba8fe3a40a5b Merged revisions 67494 via svnmerge from
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 48986
diff changeset
761 static int _Py_TracingPossible = 0;
ba8fe3a40a5b Merged revisions 67494 via svnmerge from
Jeffrey Yasskin <jyasskin@gmail.com>
parents: 48986
diff changeset
762
57175
fdd6484f1210 Merge in the new GIL.
Antoine Pitrou <solipsis@pitrou.net>
parents: 57004
diff changeset
763
173
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
764
5368
f2132d1f66a6 Quickly renamed.
Guido van Rossum <guido@python.org>
parents: 5177
diff changeset
765 PyObject *
66664
62b61abd02b8 Merge branches/pep-0384.
Martin v. Löwis <martin@v.loewis.de>
parents: 66556
diff changeset
766 PyEval_EvalCode(PyObject *co, PyObject *globals, PyObject *locals)
2844
0261bf5b3819 keyword arguments and faster calls
Guido van Rossum <guido@python.org>
parents: 2813
diff changeset
767 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
768 return PyEval_EvalCodeEx(co,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
769 globals, locals,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
770 (PyObject **)NULL, 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
771 (PyObject **)NULL, 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
772 (PyObject **)NULL, 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
773 NULL, NULL);
2844
0261bf5b3819 keyword arguments and faster calls
Guido van Rossum <guido@python.org>
parents: 2813
diff changeset
774 }
0261bf5b3819 keyword arguments and faster calls
Guido van Rossum <guido@python.org>
parents: 2813
diff changeset
775
0261bf5b3819 keyword arguments and faster calls
Guido van Rossum <guido@python.org>
parents: 2813
diff changeset
776
0261bf5b3819 keyword arguments and faster calls
Guido van Rossum <guido@python.org>
parents: 2813
diff changeset
777 /* Interpreter main loop */
0261bf5b3819 keyword arguments and faster calls
Guido van Rossum <guido@python.org>
parents: 2813
diff changeset
778
32421
485d2ef43419 Patch #966493: Cleanup generator/eval_frame exposure.
Martin v. Löwis <martin@v.loewis.de>
parents: 32412
diff changeset
779 PyObject *
35298
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw()
Phillip J. Eby <pje@telecommunity.com>
parents: 35126
diff changeset
780 PyEval_EvalFrame(PyFrameObject *f) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
781 /* This is for backward compatibility with extension modules that
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
782 used this API; core interpreter code should call
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
783 PyEval_EvalFrameEx() */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
784 return PyEval_EvalFrameEx(f, 0);
35298
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw()
Phillip J. Eby <pje@telecommunity.com>
parents: 35126
diff changeset
785 }
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw()
Phillip J. Eby <pje@telecommunity.com>
parents: 35126
diff changeset
786
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw()
Phillip J. Eby <pje@telecommunity.com>
parents: 35126
diff changeset
787 PyObject *
37879
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents: 37056
diff changeset
788 PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
173
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
789 {
5049
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
790 #ifdef DXPAIRS
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
791 int lastopcode = 0;
5049
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
792 #endif
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
793 register PyObject **stack_pointer; /* Next free slot in value stack */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
794 register unsigned char *next_instr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
795 register int opcode; /* Current opcode */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
796 register int oparg; /* Current opcode argument, if any */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
797 register enum why_code why; /* Reason for block stack unwind */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
798 register PyObject **fastlocals, **freevars;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
799 PyObject *retval = NULL; /* Return value */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
800 PyThreadState *tstate = PyThreadState_GET();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
801 PyCodeObject *co;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
802
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
803 /* when tracing we set things up so that
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
804
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
805 not (instr_lb <= current_bytecode_offset < instr_ub)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
806
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
807 is true when the line being executed has changed. The
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
808 initial values are such as to make this false the first
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
809 time it is tested. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
810 int instr_ub = -1, instr_lb = 0, instr_prev = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
811
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
812 unsigned char *first_instr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
813 PyObject *names;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
814 PyObject *consts;
173
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
815
76072
bac033e488b4 Guard an LLTRACE variable to silence an unused variable warning.
Brett Cannon <brett@python.org>
parents: 75959
diff changeset
816 #ifdef LLTRACE
75959
c67f3681e032 Issue #14383: Add _PyDict_GetItemId() and _PyDict_SetItemId() functions
Victor Stinner <victor.stinner@gmail.com>
parents: 75852
diff changeset
817 _Py_IDENTIFIER(__ltrace__);
76072
bac033e488b4 Guard an LLTRACE variable to silence an unused variable warning.
Brett Cannon <brett@python.org>
parents: 75959
diff changeset
818 #endif
75959
c67f3681e032 Issue #14383: Add _PyDict_GetItemId() and _PyDict_SetItemId() functions
Victor Stinner <victor.stinner@gmail.com>
parents: 75852
diff changeset
819
51031
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
820 /* Computed GOTOs, or
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
821 the-optimization-commonly-but-improperly-known-as-"threaded code"
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
822 using gcc's labels-as-values extension
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
823 (http://gcc.gnu.org/onlinedocs/gcc/Labels-as-Values.html).
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
824
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
825 The traditional bytecode evaluation loop uses a "switch" statement, which
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
826 decent compilers will optimize as a single indirect branch instruction
51031
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
827 combined with a lookup table of jump addresses. However, since the
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
828 indirect jump instruction is shared by all opcodes, the CPU will have a
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
829 hard time making the right prediction for where to jump next (actually,
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
830 it will be always wrong except in the uncommon case of a sequence of
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
831 several identical opcodes).
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
832
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
833 "Threaded code" in contrast, uses an explicit jump table and an explicit
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
834 indirect jump instruction at the end of each opcode. Since the jump
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
835 instruction is at a different address for each opcode, the CPU will make a
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
836 separate prediction for each of these instructions, which is equivalent to
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
837 predicting the second opcode of each opcode pair. These predictions have
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
838 a much better chance to turn out valid, especially in small bytecode loops.
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
839
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
840 A mispredicted branch on a modern CPU flushes the whole pipeline and
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
841 can cost several CPU cycles (depending on the pipeline depth),
51031
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
842 and potentially many more instructions (depending on the pipeline width).
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
843 A correctly predicted branch, however, is nearly free.
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
844
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
845 At the time of this writing, the "threaded code" version is up to 15-20%
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
846 faster than the normal "switch" version, depending on the compiler and the
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
847 CPU architecture.
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
848
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
849 We disable the optimization if DYNAMIC_EXECUTION_PROFILE is defined,
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
850 because it would render the measurements invalid.
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
851
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
852
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
853 NOTE: care must be taken that the compiler doesn't try to "optimize" the
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
854 indirect jumps by sharing them between all opcodes. Such optimizations
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
855 can be disabled on gcc by using the -fno-gcse flag (or possibly
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
856 -fno-crossjumping).
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
857 */
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
858
63959
e54baebbd6ff Issue #9203: Computed gotos are now enabled by default on supported
Antoine Pitrou <solipsis@pitrou.net>
parents: 63114
diff changeset
859 #ifdef DYNAMIC_EXECUTION_PROFILE
51031
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
860 #undef USE_COMPUTED_GOTOS
63959
e54baebbd6ff Issue #9203: Computed gotos are now enabled by default on supported
Antoine Pitrou <solipsis@pitrou.net>
parents: 63114
diff changeset
861 #define USE_COMPUTED_GOTOS 0
51031
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
862 #endif
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
863
63959
e54baebbd6ff Issue #9203: Computed gotos are now enabled by default on supported
Antoine Pitrou <solipsis@pitrou.net>
parents: 63114
diff changeset
864 #ifdef HAVE_COMPUTED_GOTOS
e54baebbd6ff Issue #9203: Computed gotos are now enabled by default on supported
Antoine Pitrou <solipsis@pitrou.net>
parents: 63114
diff changeset
865 #ifndef USE_COMPUTED_GOTOS
e54baebbd6ff Issue #9203: Computed gotos are now enabled by default on supported
Antoine Pitrou <solipsis@pitrou.net>
parents: 63114
diff changeset
866 #define USE_COMPUTED_GOTOS 1
e54baebbd6ff Issue #9203: Computed gotos are now enabled by default on supported
Antoine Pitrou <solipsis@pitrou.net>
parents: 63114
diff changeset
867 #endif
e54baebbd6ff Issue #9203: Computed gotos are now enabled by default on supported
Antoine Pitrou <solipsis@pitrou.net>
parents: 63114
diff changeset
868 #else
e54baebbd6ff Issue #9203: Computed gotos are now enabled by default on supported
Antoine Pitrou <solipsis@pitrou.net>
parents: 63114
diff changeset
869 #if defined(USE_COMPUTED_GOTOS) && USE_COMPUTED_GOTOS
e54baebbd6ff Issue #9203: Computed gotos are now enabled by default on supported
Antoine Pitrou <solipsis@pitrou.net>
parents: 63114
diff changeset
870 #error "Computed gotos are not supported on this compiler."
e54baebbd6ff Issue #9203: Computed gotos are now enabled by default on supported
Antoine Pitrou <solipsis@pitrou.net>
parents: 63114
diff changeset
871 #endif
e54baebbd6ff Issue #9203: Computed gotos are now enabled by default on supported
Antoine Pitrou <solipsis@pitrou.net>
parents: 63114
diff changeset
872 #undef USE_COMPUTED_GOTOS
e54baebbd6ff Issue #9203: Computed gotos are now enabled by default on supported
Antoine Pitrou <solipsis@pitrou.net>
parents: 63114
diff changeset
873 #define USE_COMPUTED_GOTOS 0
e54baebbd6ff Issue #9203: Computed gotos are now enabled by default on supported
Antoine Pitrou <solipsis@pitrou.net>
parents: 63114
diff changeset
874 #endif
e54baebbd6ff Issue #9203: Computed gotos are now enabled by default on supported
Antoine Pitrou <solipsis@pitrou.net>
parents: 63114
diff changeset
875
e54baebbd6ff Issue #9203: Computed gotos are now enabled by default on supported
Antoine Pitrou <solipsis@pitrou.net>
parents: 63114
diff changeset
876 #if USE_COMPUTED_GOTOS
51031
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
877 /* Import the static jump table */
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
878 #include "opcode_targets.h"
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
879
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
880 /* This macro is used when several opcodes defer to the same implementation
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
881 (e.g. SETUP_LOOP, SETUP_FINALLY) */
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
882 #define TARGET_WITH_IMPL(op, impl) \
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
883 TARGET_##op: \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
884 opcode = op; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
885 if (HAS_ARG(op)) \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
886 oparg = NEXTARG(); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
887 case op: \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
888 goto impl; \
51031
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
889
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
890 #define TARGET(op) \
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
891 TARGET_##op: \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
892 opcode = op; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
893 if (HAS_ARG(op)) \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
894 oparg = NEXTARG(); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
895 case op:
51031
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
896
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
897
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
898 #define DISPATCH() \
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
899 { \
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
900 if (!_Py_atomic_load_relaxed(&eval_breaker)) { \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
901 FAST_DISPATCH(); \
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
902 } \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
903 continue; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
904 }
51031
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
905
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
906 #ifdef LLTRACE
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
907 #define FAST_DISPATCH() \
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
908 { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
909 if (!lltrace && !_Py_TracingPossible) { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
910 f->f_lasti = INSTR_OFFSET(); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
911 goto *opcode_targets[*next_instr++]; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
912 } \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
913 goto fast_next_opcode; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
914 }
51031
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
915 #else
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
916 #define FAST_DISPATCH() \
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
917 { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
918 if (!_Py_TracingPossible) { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
919 f->f_lasti = INSTR_OFFSET(); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
920 goto *opcode_targets[*next_instr++]; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
921 } \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
922 goto fast_next_opcode; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
923 }
51031
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
924 #endif
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
925
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
926 #else
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
927 #define TARGET(op) \
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
928 case op:
51031
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
929 #define TARGET_WITH_IMPL(op, impl) \
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
930 /* silence compiler warnings about `impl` unused */ \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
931 if (0) goto impl; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
932 case op:
51031
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
933 #define DISPATCH() continue
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
934 #define FAST_DISPATCH() goto fast_next_opcode
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
935 #endif
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
936
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
937
24232
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c
Neal Norwitz <nnorwitz@gmail.com>
parents: 24190
diff changeset
938 /* Tuple access macros */
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c
Neal Norwitz <nnorwitz@gmail.com>
parents: 24190
diff changeset
939
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c
Neal Norwitz <nnorwitz@gmail.com>
parents: 24190
diff changeset
940 #ifndef Py_DEBUG
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c
Neal Norwitz <nnorwitz@gmail.com>
parents: 24190
diff changeset
941 #define GETITEM(v, i) PyTuple_GET_ITEM((PyTupleObject *)(v), (i))
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c
Neal Norwitz <nnorwitz@gmail.com>
parents: 24190
diff changeset
942 #else
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c
Neal Norwitz <nnorwitz@gmail.com>
parents: 24190
diff changeset
943 #define GETITEM(v, i) PyTuple_GetItem((v), (i))
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c
Neal Norwitz <nnorwitz@gmail.com>
parents: 24190
diff changeset
944 #endif
e06b1ab0bdb8 SF patch # 580411, move frame macros from frameobject.h into ceval.c
Neal Norwitz <nnorwitz@gmail.com>
parents: 24190
diff changeset
945
32301
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
946 #ifdef WITH_TSC
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
947 /* Use Pentium timestamp counter to mark certain events:
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
948 inst0 -- beginning of switch statement for opcode dispatch
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
949 inst1 -- end of switch statement (may be skipped)
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
950 loop0 -- the top of the mainloop
38453
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents: 37879
diff changeset
951 loop1 -- place where control returns again to top of mainloop
32301
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
952 (may be skipped)
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
953 intr1 -- beginning of long interruption
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
954 intr2 -- end of long interruption
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
955
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
956 Many opcodes call out to helper C functions. In some cases, the
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
957 time in those functions should be counted towards the time for the
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
958 opcode, but not in all cases. For example, a CALL_FUNCTION opcode
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
959 calls another Python function; there's no point in charge all the
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
960 bytecode executed by the called function to the caller.
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
961
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
962 It's hard to make a useful judgement statically. In the presence
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
963 of operator overloading, it's impossible to tell if a call will
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
964 execute new Python code or not.
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
965
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
966 It's a case-by-case judgement. I'll use intr1 for the following
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
967 cases:
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
968
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
969 IMPORT_STAR
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
970 IMPORT_FROM
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
971 CALL_FUNCTION (and friends)
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
972
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
973 */
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
974 uint64 inst0, inst1, loop0, loop1, intr0 = 0, intr1 = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
975 int ticked = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
976
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
977 READ_TIMESTAMP(inst0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
978 READ_TIMESTAMP(inst1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
979 READ_TIMESTAMP(loop0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
980 READ_TIMESTAMP(loop1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
981
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
982 /* shut up the compiler */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
983 opcode = 0;
32301
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
984 #endif
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
985
173
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
986 /* Code access macros */
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
987
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
988 #define INSTR_OFFSET() ((int)(next_instr - first_instr))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
989 #define NEXTOP() (*next_instr++)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
990 #define NEXTARG() (next_instr += 2, (next_instr[-1]<<8) + next_instr[-2])
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
991 #define PEEKARG() ((next_instr[2]<<8) + next_instr[1])
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
992 #define JUMPTO(x) (next_instr = first_instr + (x))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
993 #define JUMPBY(x) (next_instr += (x))
173
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
994
28302
8c082936daaf Introduced macros for a simple opcode prediction protocol.
Raymond Hettinger <python@rcn.com>
parents: 28296
diff changeset
995 /* OpCode prediction macros
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
996 Some opcodes tend to come in pairs thus making it possible to
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
997 predict the second code when the first is run. For example,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
998 COMPARE_OP is often followed by JUMP_IF_FALSE or JUMP_IF_TRUE. And,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
999 those opcodes are often followed by a POP_TOP.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1000
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1001 Verifying the prediction costs a single high-speed test of a register
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1002 variable against a constant. If the pairing was good, then the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1003 processor's own internal branch predication has a high likelihood of
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1004 success, resulting in a nearly zero-overhead transition to the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1005 next opcode. A successful prediction saves a trip through the eval-loop
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1006 including its two unpredictable branches, the HAS_ARG test and the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1007 switch-case. Combined with the processor's internal branch prediction,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1008 a successful PREDICT has the effect of making the two opcodes run as if
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1009 they were a single new opcode with the bodies combined.
48494
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from
Georg Brandl <georg@python.org>
parents: 47729
diff changeset
1010
aca5b2e6a66f Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from
Georg Brandl <georg@python.org>
parents: 47729
diff changeset
1011 If collecting opcode statistics, your choices are to either keep the
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1012 predictions turned-on and interpret the results as if some opcodes
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1013 had been combined or turn-off predictions so that the opcode frequency
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1014 counter updates for both opcodes.
51031
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
1015
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
1016 Opcode prediction is disabled with threaded code, since the latter allows
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1017 the CPU to record separate branch prediction information for each
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1018 opcode.
51031
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
1019
28302
8c082936daaf Introduced macros for a simple opcode prediction protocol.
Raymond Hettinger <python@rcn.com>
parents: 28296
diff changeset
1020 */
8c082936daaf Introduced macros for a simple opcode prediction protocol.
Raymond Hettinger <python@rcn.com>
parents: 28296
diff changeset
1021
63959
e54baebbd6ff Issue #9203: Computed gotos are now enabled by default on supported
Antoine Pitrou <solipsis@pitrou.net>
parents: 63114
diff changeset
1022 #if defined(DYNAMIC_EXECUTION_PROFILE) || USE_COMPUTED_GOTOS
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1023 #define PREDICT(op) if (0) goto PRED_##op
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1024 #define PREDICTED(op) PRED_##op:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1025 #define PREDICTED_WITH_ARG(op) PRED_##op:
31487
f57f5ce22c8d SF patch #884022: dynamic execution profiling vs opcode prediction
Raymond Hettinger <python@rcn.com>
parents: 31462
diff changeset
1026 #else
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1027 #define PREDICT(op) if (*next_instr == op) goto PRED_##op
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1028 #define PREDICTED(op) PRED_##op: next_instr++
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1029 #define PREDICTED_WITH_ARG(op) PRED_##op: oparg = PEEKARG(); next_instr += 3
51031
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
1030 #endif
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
1031
28302
8c082936daaf Introduced macros for a simple opcode prediction protocol.
Raymond Hettinger <python@rcn.com>
parents: 28296
diff changeset
1032
173
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
1033 /* Stack manipulation macros */
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
1034
36501
7fdc639bc5b4 Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents: 36475
diff changeset
1035 /* The stack can grow at most MAXINT deep, as co_nlocals and
7fdc639bc5b4 Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents: 36475
diff changeset
1036 co_stacksize are ints. */
62462
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1037 #define STACK_LEVEL() ((int)(stack_pointer - f->f_valuestack))
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1038 #define EMPTY() (STACK_LEVEL() == 0)
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1039 #define TOP() (stack_pointer[-1])
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1040 #define SECOND() (stack_pointer[-2])
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1041 #define THIRD() (stack_pointer[-3])
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1042 #define FOURTH() (stack_pointer[-4])
62461
c8d5d1205fe8 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting.
Stefan Krah <stefan@bytereef.org>
parents: 61993
diff changeset
1043 #define PEEK(n) (stack_pointer[-(n)])
62462
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1044 #define SET_TOP(v) (stack_pointer[-1] = (v))
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1045 #define SET_SECOND(v) (stack_pointer[-2] = (v))
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1046 #define SET_THIRD(v) (stack_pointer[-3] = (v))
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1047 #define SET_FOURTH(v) (stack_pointer[-4] = (v))
62461
c8d5d1205fe8 Issue #8930: Remaining indentation fixes after the Grand Unified Indenting.
Stefan Krah <stefan@bytereef.org>
parents: 61993
diff changeset
1048 #define SET_VALUE(n, v) (stack_pointer[-(n)] = (v))
62462
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1049 #define BASIC_STACKADJ(n) (stack_pointer += n)
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1050 #define BASIC_PUSH(v) (*stack_pointer++ = (v))
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1051 #define BASIC_POP() (*--stack_pointer)
173
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
1052
567
8c179d023583 User trace feature.
Guido van Rossum <guido@python.org>
parents: 565
diff changeset
1053 #ifdef LLTRACE
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1054 #define PUSH(v) { (void)(BASIC_PUSH(v), \
62462
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1055 lltrace && prtrace(TOP(), "push")); \
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1056 assert(STACK_LEVEL() <= co->co_stacksize); }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1057 #define POP() ((void)(lltrace && prtrace(TOP(), "pop")), \
62462
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1058 BASIC_POP())
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1059 #define STACKADJ(n) { (void)(BASIC_STACKADJ(n), \
62462
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1060 lltrace && prtrace(TOP(), "stackadj")); \
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1061 assert(STACK_LEVEL() <= co->co_stacksize); }
44310
e70acbf26cda Merged revisions 59488-59511 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents: 44187
diff changeset
1062 #define EXT_POP(STACK_POINTER) ((void)(lltrace && \
62462
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1063 prtrace((STACK_POINTER)[-1], "ext_pop")), \
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1064 *--(STACK_POINTER))
173
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
1065 #else
62462
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1066 #define PUSH(v) BASIC_PUSH(v)
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1067 #define POP() BASIC_POP()
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1068 #define STACKADJ(n) BASIC_STACKADJ(n)
36695
b6d2f6fd3e11 PEP 343 -- the with-statement.
Guido van Rossum <guido@python.org>
parents: 36580
diff changeset
1069 #define EXT_POP(STACK_POINTER) (*--(STACK_POINTER))
173
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
1070 #endif
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
1071
2844
0261bf5b3819 keyword arguments and faster calls
Guido van Rossum <guido@python.org>
parents: 2813
diff changeset
1072 /* Local variable macros */
0261bf5b3819 keyword arguments and faster calls
Guido van Rossum <guido@python.org>
parents: 2813
diff changeset
1073
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1074 #define GETLOCAL(i) (fastlocals[i])
22621
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of
Guido van Rossum <guido@python.org>
parents: 22499
diff changeset
1075
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of
Guido van Rossum <guido@python.org>
parents: 22499
diff changeset
1076 /* The SETLOCAL() macro must not DECREF the local variable in-place and
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of
Guido van Rossum <guido@python.org>
parents: 22499
diff changeset
1077 then store the new value; it must copy the old value to a temporary
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of
Guido van Rossum <guido@python.org>
parents: 22499
diff changeset
1078 value, then store the new value, and then DECREF the temporary value.
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of
Guido van Rossum <guido@python.org>
parents: 22499
diff changeset
1079 This is because it is possible that during the DECREF the frame is
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of
Guido van Rossum <guido@python.org>
parents: 22499
diff changeset
1080 accessed by other code (e.g. a __del__ method or gc.collect()) and the
830c829a7eb2 Fix an issue that was reported in but unrelated to the main problem of
Guido van Rossum <guido@python.org>
parents: 22499
diff changeset
1081 variable would be pointing to already-freed memory. */
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1082 #define SETLOCAL(i, value) do { PyObject *tmp = GETLOCAL(i); \
62462
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1083 GETLOCAL(i) = value; \
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1084 Py_XDECREF(tmp); } while (0)
2844
0261bf5b3819 keyword arguments and faster calls
Guido van Rossum <guido@python.org>
parents: 2813
diff changeset
1085
47594
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers
Benjamin Peterson <benjamin@python.org>
parents: 47301
diff changeset
1086
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers
Benjamin Peterson <benjamin@python.org>
parents: 47301
diff changeset
1087 #define UNWIND_BLOCK(b) \
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1088 while (STACK_LEVEL() > (b)->b_level) { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1089 PyObject *v = POP(); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1090 Py_XDECREF(v); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1091 }
47594
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers
Benjamin Peterson <benjamin@python.org>
parents: 47301
diff changeset
1092
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers
Benjamin Peterson <benjamin@python.org>
parents: 47301
diff changeset
1093 #define UNWIND_EXCEPT_HANDLER(b) \
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1094 { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1095 PyObject *type, *value, *traceback; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1096 assert(STACK_LEVEL() >= (b)->b_level + 3); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1097 while (STACK_LEVEL() > (b)->b_level + 3) { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1098 value = POP(); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1099 Py_XDECREF(value); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1100 } \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1101 type = tstate->exc_type; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1102 value = tstate->exc_value; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1103 traceback = tstate->exc_traceback; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1104 tstate->exc_type = POP(); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1105 tstate->exc_value = POP(); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1106 tstate->exc_traceback = POP(); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1107 Py_XDECREF(type); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1108 Py_XDECREF(value); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1109 Py_XDECREF(traceback); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1110 }
47594
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers
Benjamin Peterson <benjamin@python.org>
parents: 47301
diff changeset
1111
5405
b7871ca930ad Massive changes for separate thread state management.
Guido van Rossum <guido@python.org>
parents: 5368
diff changeset
1112 /* Start of code */
b7871ca930ad Massive changes for separate thread state management.
Guido van Rossum <guido@python.org>
parents: 5368
diff changeset
1113
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1114 /* push frame */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1115 if (Py_EnterRecursiveCall(""))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1116 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1117
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1118 tstate->frame = f;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1119
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1120 if (tstate->use_tracing) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1121 if (tstate->c_tracefunc != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1122 /* tstate->c_tracefunc, if defined, is a
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1123 function that will be called on *every* entry
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1124 to a code block. Its return value, if not
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1125 None, is a function that will be called at
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1126 the start of each executed line of code.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1127 (Actually, the function must return itself
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1128 in order to continue tracing.) The trace
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1129 functions are called with three arguments:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1130 a pointer to the current frame, a string
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1131 indicating why the function is called, and
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1132 an argument which depends on the situation.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1133 The global trace function is also called
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1134 whenever an exception is detected. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1135 if (call_trace_protected(tstate->c_tracefunc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1136 tstate->c_traceobj,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1137 f, PyTrace_CALL, Py_None)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1138 /* Trace function raised an error */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1139 goto exit_eval_frame;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1140 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1141 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1142 if (tstate->c_profilefunc != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1143 /* Similar for c_profilefunc, except it needn't
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1144 return itself and isn't called for "line" events */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1145 if (call_trace_protected(tstate->c_profilefunc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1146 tstate->c_profileobj,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1147 f, PyTrace_CALL, Py_None)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1148 /* Profile function raised an error */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1149 goto exit_eval_frame;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1150 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1151 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1152 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1153
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1154 co = f->f_code;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1155 names = co->co_names;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1156 consts = co->co_consts;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1157 fastlocals = f->f_localsplus;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1158 freevars = f->f_localsplus + co->co_nlocals;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1159 first_instr = (unsigned char*) PyBytes_AS_STRING(co->co_code);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1160 /* An explanation is in order for the next line.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1161
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1162 f->f_lasti now refers to the index of the last instruction
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1163 executed. You might think this was obvious from the name, but
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1164 this wasn't always true before 2.3! PyFrame_New now sets
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1165 f->f_lasti to -1 (i.e. the index *before* the first instruction)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1166 and YIELD_VALUE doesn't fiddle with f_lasti any more. So this
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1167 does work. Promise.
75714
72556ff86828 perform yield from delegation by repeating YIELD_FROM opcode (closes #14230)
Benjamin Peterson <benjamin@python.org>
parents: 75292
diff changeset
1168 YIELD_FROM sets f_lasti to itself, in order to repeated yield
72556ff86828 perform yield from delegation by repeating YIELD_FROM opcode (closes #14230)
Benjamin Peterson <benjamin@python.org>
parents: 75292
diff changeset
1169 multiple values.
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1170
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1171 When the PREDICT() macros are enabled, some opcode pairs follow in
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1172 direct succession without updating f->f_lasti. A successful
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1173 prediction effectively links the two codes together as if they
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1174 were a single new opcode; accordingly,f->f_lasti will point to
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1175 the first code in the pair (for instance, GET_ITER followed by
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1176 FOR_ITER is effectively a single opcode and f->f_lasti will point
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1177 at to the beginning of the combined pair.)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1178 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1179 next_instr = first_instr + f->f_lasti + 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1180 stack_pointer = f->f_stacktop;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1181 assert(stack_pointer != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1182 f->f_stacktop = NULL; /* remains NULL unless yield suspends frame */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1183
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1184 if (co->co_flags & CO_GENERATOR && !throwflag) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1185 if (f->f_exc_type != NULL && f->f_exc_type != Py_None) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1186 /* We were in an except handler when we left,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1187 restore the exception state which was put aside
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1188 (see YIELD_VALUE). */
71159
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
1189 swap_exc_state(tstate, f);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1190 }
71159
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
1191 else
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
1192 save_exc_state(tstate, f);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1193 }
47594
212a1fee6bf9 #3021: Antoine Pitrou's Lexical exception handlers
Benjamin Peterson <benjamin@python.org>
parents: 47301
diff changeset
1194
18148
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay!
Tim Peters <tim.peters@gmail.com>
parents: 18136
diff changeset
1195 #ifdef LLTRACE
75959
c67f3681e032 Issue #14383: Add _PyDict_GetItemId() and _PyDict_SetItemId() functions
Victor Stinner <victor.stinner@gmail.com>
parents: 75852
diff changeset
1196 lltrace = _PyDict_GetItemId(f->f_globals, &PyId___ltrace__) != NULL;
18148
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay!
Tim Peters <tim.peters@gmail.com>
parents: 18136
diff changeset
1197 #endif
15948
3bc2440427d3 Rich comparisons fall-out:
Guido van Rossum <guido@python.org>
parents: 15899
diff changeset
1198
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1199 why = WHY_NOT;
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1200
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1201 if (throwflag) /* support for generator.throw() */
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1202 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1203
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1204 for (;;) {
32301
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
1205 #ifdef WITH_TSC
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1206 if (inst1 == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1207 /* Almost surely, the opcode executed a break
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1208 or a continue, preventing inst1 from being set
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1209 on the way out of the loop.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1210 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1211 READ_TIMESTAMP(inst1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1212 loop1 = inst1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1213 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1214 dump_tsc(opcode, ticked, inst0, inst1, loop0, loop1,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1215 intr0, intr1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1216 ticked = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1217 inst1 = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1218 intr0 = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1219 intr1 = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1220 READ_TIMESTAMP(loop0);
32301
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
1221 #endif
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1222 assert(stack_pointer >= f->f_valuestack); /* else underflow */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1223 assert(STACK_LEVEL() <= co->co_stacksize); /* else overflow */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1224
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1225 /* Do periodic things. Doing this every time through
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1226 the loop would add too much overhead, so we do it
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1227 only every Nth instruction. We also do it if
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1228 ``pendingcalls_to_do'' is set, i.e. when an asynchronous
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1229 event needs attention (e.g. a signal handler or
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1230 async I/O handler); see Py_AddPendingCall() and
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1231 Py_MakePendingCalls() above. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1232
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
1233 if (_Py_atomic_load_relaxed(&eval_breaker)) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1234 if (*next_instr == SETUP_FINALLY) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1235 /* Make the last opcode before
68585
bf94b6a73fc8 #11565: Fix several typos. Patch by Piotr Kasprzyk.
Ezio Melotti <ezio.melotti@gmail.com>
parents: 67414
diff changeset
1236 a try: finally: block uninterruptible. */
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1237 goto fast_next_opcode;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1238 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1239 tstate->tick_counter++;
32301
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
1240 #ifdef WITH_TSC
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1241 ticked = 1;
32301
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
1242 #endif
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
1243 if (_Py_atomic_load_relaxed(&pendingcalls_to_do)) {
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1244 if (Py_MakePendingCalls() < 0)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1245 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1246 }
1846
5243fb187d36 call_object: print message before abort()
Guido van Rossum <guido@python.org>
parents: 1425
diff changeset
1247 #ifdef WITH_THREAD
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
1248 if (_Py_atomic_load_relaxed(&gil_drop_request)) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1249 /* Give another thread a chance */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1250 if (PyThreadState_Swap(NULL) != tstate)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1251 Py_FatalError("ceval: tstate mix-up");
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
1252 drop_gil(tstate);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1253
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1254 /* Other threads may run now */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1255
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
1256 take_gil(tstate);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1257 if (PyThreadState_Swap(tstate) != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1258 Py_FatalError("ceval: orphan tstate");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1259 }
923
72aceed365d4 * Makefile adapted to changes below.
Guido van Rossum <guido@python.org>
parents: 815
diff changeset
1260 #endif
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
1261 /* Check for asynchronous exceptions. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
1262 if (tstate->async_exc != NULL) {
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1263 PyObject *exc = tstate->async_exc;
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
1264 tstate->async_exc = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
1265 UNSIGNAL_ASYNC_EXC();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1266 PyErr_SetNone(exc);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1267 Py_DECREF(exc);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1268 goto error;
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
1269 }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1270 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1271
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1272 fast_next_opcode:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1273 f->f_lasti = INSTR_OFFSET();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1274
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1275 /* line-by-line tracing support */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1276
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1277 if (_Py_TracingPossible &&
81677
cd87afe18ff8 revert #16672 for incorrect semantics
Benjamin Peterson <benjamin@python.org>
parents: 81015
diff changeset
1278 tstate->c_tracefunc != NULL && !tstate->tracing) {
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1279 int err;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1280 /* see maybe_call_line_trace
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1281 for expository comments */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1282 f->f_stacktop = stack_pointer;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1283
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1284 err = maybe_call_line_trace(tstate->c_tracefunc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1285 tstate->c_traceobj,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1286 f, &instr_lb, &instr_ub,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1287 &instr_prev);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1288 /* Reload possibly changed frame fields */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1289 JUMPTO(f->f_lasti);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1290 if (f->f_stacktop != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1291 stack_pointer = f->f_stacktop;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1292 f->f_stacktop = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1293 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1294 if (err)
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1295 /* trace function raised an exception */
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1296 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1297 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1298
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1299 /* Extract opcode and argument */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1300
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1301 opcode = NEXTOP();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1302 oparg = 0; /* allows oparg to be stored in a register because
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1303 it doesn't have to be remembered across a full loop */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1304 if (HAS_ARG(opcode))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1305 oparg = NEXTARG();
62462
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
1306 dispatch_opcode:
5049
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
1307 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
1308 #ifdef DXPAIRS
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1309 dxpairs[lastopcode][opcode]++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1310 lastopcode = opcode;
5049
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
1311 #endif
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1312 dxp[opcode]++;
5049
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
1313 #endif
173
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
1314
567
8c179d023583 User trace feature.
Guido van Rossum <guido@python.org>
parents: 565
diff changeset
1315 #ifdef LLTRACE
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1316 /* Instruction tracing */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1317
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1318 if (lltrace) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1319 if (HAS_ARG(opcode)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1320 printf("%d: %d, %d\n",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1321 f->f_lasti, opcode, oparg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1322 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1323 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1324 printf("%d: %d\n",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1325 f->f_lasti, opcode);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1326 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1327 }
173
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
1328 #endif
24844
cf5928fab108 This is my patch
Michael W. Hudson <mwh@python.net>
parents: 24718
diff changeset
1329
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1330 /* Main switch on opcode */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1331 READ_TIMESTAMP(inst0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1332
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1333 switch (opcode) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1334
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1335 /* BEWARE!
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1336 It is essential that any operation that fails sets either
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1337 x to NULL, err to nonzero, or why to anything but WHY_NOT,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1338 and that no operation that succeeds does this! */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1339
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1340 TARGET(NOP)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1341 FAST_DISPATCH();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1342
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1343 TARGET(LOAD_FAST) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1344 PyObject *value = GETLOCAL(oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1345 if (value == NULL) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1346 format_exc_check_arg(PyExc_UnboundLocalError,
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1347 UNBOUNDLOCAL_ERROR_MSG,
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1348 PyTuple_GetItem(co->co_varnames, oparg));
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1349 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1350 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1351 Py_INCREF(value);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1352 PUSH(value);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1353 FAST_DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1354 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1355
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1356 TARGET(LOAD_CONST) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1357 PyObject *value = GETITEM(consts, oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1358 Py_INCREF(value);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1359 PUSH(value);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1360 FAST_DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1361 }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1362
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1363 PREDICTED_WITH_ARG(STORE_FAST);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1364 TARGET(STORE_FAST) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1365 PyObject *value = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1366 SETLOCAL(oparg, value);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1367 FAST_DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1368 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1369
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1370 TARGET(POP_TOP) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1371 PyObject *value = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1372 Py_DECREF(value);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1373 FAST_DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1374 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1375
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1376 TARGET(ROT_TWO) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1377 PyObject *top = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1378 PyObject *second = SECOND();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1379 SET_TOP(second);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1380 SET_SECOND(top);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1381 FAST_DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1382 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1383
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1384 TARGET(ROT_THREE) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1385 PyObject *top = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1386 PyObject *second = SECOND();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1387 PyObject *third = THIRD();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1388 SET_TOP(second);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1389 SET_SECOND(third);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1390 SET_THIRD(top);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1391 FAST_DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1392 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1393
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1394 TARGET(DUP_TOP) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1395 PyObject *top = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1396 Py_INCREF(top);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1397 PUSH(top);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1398 FAST_DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1399 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1400
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1401 TARGET(DUP_TOP_TWO) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1402 PyObject *top = TOP();
79694
6ca52f901fc1 move declaration to top of block
Benjamin Peterson <benjamin@python.org>
parents: 79693
diff changeset
1403 PyObject *second = SECOND();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1404 Py_INCREF(top);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1405 Py_INCREF(second);
64439
725231211273 Issue #9225: Remove the ROT_FOUR and DUP_TOPX opcode, the latter replaced
Antoine Pitrou <solipsis@pitrou.net>
parents: 64092
diff changeset
1406 STACKADJ(2);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1407 SET_TOP(top);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1408 SET_SECOND(second);
64439
725231211273 Issue #9225: Remove the ROT_FOUR and DUP_TOPX opcode, the latter replaced
Antoine Pitrou <solipsis@pitrou.net>
parents: 64092
diff changeset
1409 FAST_DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1410 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1411
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1412 TARGET(UNARY_POSITIVE) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1413 PyObject *value = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1414 PyObject *res = PyNumber_Positive(value);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1415 Py_DECREF(value);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1416 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1417 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1418 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1419 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1420 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1421
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1422 TARGET(UNARY_NEGATIVE) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1423 PyObject *value = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1424 PyObject *res = PyNumber_Negative(value);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1425 Py_DECREF(value);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1426 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1427 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1428 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1429 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1430 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1431
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1432 TARGET(UNARY_NOT) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1433 PyObject *value = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1434 int err = PyObject_IsTrue(value);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1435 Py_DECREF(value);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1436 if (err == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1437 Py_INCREF(Py_True);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1438 SET_TOP(Py_True);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1439 DISPATCH();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1440 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1441 else if (err > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1442 Py_INCREF(Py_False);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1443 SET_TOP(Py_False);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1444 err = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1445 DISPATCH();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1446 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1447 STACKADJ(-1);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1448 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1449 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1450
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1451 TARGET(UNARY_INVERT) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1452 PyObject *value = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1453 PyObject *res = PyNumber_Invert(value);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1454 Py_DECREF(value);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1455 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1456 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1457 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1458 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1459 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1460
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1461 TARGET(BINARY_POWER) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1462 PyObject *exp = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1463 PyObject *base = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1464 PyObject *res = PyNumber_Power(base, exp, Py_None);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1465 Py_DECREF(base);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1466 Py_DECREF(exp);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1467 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1468 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1469 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1470 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1471 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1472
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1473 TARGET(BINARY_MULTIPLY) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1474 PyObject *right = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1475 PyObject *left = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1476 PyObject *res = PyNumber_Multiply(left, right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1477 Py_DECREF(left);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1478 Py_DECREF(right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1479 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1480 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1481 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1482 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1483 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1484
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1485 TARGET(BINARY_TRUE_DIVIDE) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1486 PyObject *divisor = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1487 PyObject *dividend = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1488 PyObject *quotient = PyNumber_TrueDivide(dividend, divisor);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1489 Py_DECREF(dividend);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1490 Py_DECREF(divisor);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1491 SET_TOP(quotient);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1492 if (quotient == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1493 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1494 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1495 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1496
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1497 TARGET(BINARY_FLOOR_DIVIDE) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1498 PyObject *divisor = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1499 PyObject *dividend = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1500 PyObject *quotient = PyNumber_FloorDivide(dividend, divisor);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1501 Py_DECREF(dividend);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1502 Py_DECREF(divisor);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1503 SET_TOP(quotient);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1504 if (quotient == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1505 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1506 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1507 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1508
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1509 TARGET(BINARY_MODULO) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1510 PyObject *divisor = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1511 PyObject *dividend = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1512 PyObject *res = PyUnicode_CheckExact(dividend) ?
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1513 PyUnicode_Format(dividend, divisor) :
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1514 PyNumber_Remainder(dividend, divisor);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1515 Py_DECREF(divisor);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1516 Py_DECREF(dividend);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1517 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1518 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1519 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1520 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1521 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1522
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1523 TARGET(BINARY_ADD) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1524 PyObject *right = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1525 PyObject *left = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1526 PyObject *sum;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1527 if (PyUnicode_CheckExact(left) &&
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1528 PyUnicode_CheckExact(right)) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1529 sum = unicode_concatenate(left, right, f, next_instr);
72605
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
1530 /* unicode_concatenate consumed the ref to v */
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
1531 }
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
1532 else {
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1533 sum = PyNumber_Add(left, right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1534 Py_DECREF(left);
72605
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
1535 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1536 Py_DECREF(right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1537 SET_TOP(sum);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1538 if (sum == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1539 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1540 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1541 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1542
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1543 TARGET(BINARY_SUBTRACT) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1544 PyObject *right = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1545 PyObject *left = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1546 PyObject *diff = PyNumber_Subtract(left, right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1547 Py_DECREF(right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1548 Py_DECREF(left);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1549 SET_TOP(diff);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1550 if (diff == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1551 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1552 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1553 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1554
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1555 TARGET(BINARY_SUBSCR) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1556 PyObject *sub = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1557 PyObject *container = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1558 PyObject *res = PyObject_GetItem(container, sub);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1559 Py_DECREF(container);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1560 Py_DECREF(sub);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1561 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1562 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1563 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1564 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1565 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1566
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1567 TARGET(BINARY_LSHIFT) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1568 PyObject *right = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1569 PyObject *left = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1570 PyObject *res = PyNumber_Lshift(left, right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1571 Py_DECREF(left);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1572 Py_DECREF(right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1573 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1574 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1575 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1576 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1577 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1578
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1579 TARGET(BINARY_RSHIFT) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1580 PyObject *right = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1581 PyObject *left = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1582 PyObject *res = PyNumber_Rshift(left, right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1583 Py_DECREF(left);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1584 Py_DECREF(right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1585 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1586 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1587 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1588 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1589 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1590
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1591 TARGET(BINARY_AND) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1592 PyObject *right = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1593 PyObject *left = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1594 PyObject *res = PyNumber_And(left, right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1595 Py_DECREF(left);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1596 Py_DECREF(right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1597 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1598 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1599 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1600 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1601 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1602
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1603 TARGET(BINARY_XOR) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1604 PyObject *right = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1605 PyObject *left = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1606 PyObject *res = PyNumber_Xor(left, right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1607 Py_DECREF(left);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1608 Py_DECREF(right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1609 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1610 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1611 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1612 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1613 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1614
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1615 TARGET(BINARY_OR) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1616 PyObject *right = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1617 PyObject *left = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1618 PyObject *res = PyNumber_Or(left, right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1619 Py_DECREF(left);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1620 Py_DECREF(right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1621 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1622 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1623 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1624 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1625 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1626
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1627 TARGET(LIST_APPEND) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1628 PyObject *v = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1629 PyObject *list = PEEK(oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1630 int err;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1631 err = PyList_Append(list, v);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1632 Py_DECREF(v);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1633 if (err != 0)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1634 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1635 PREDICT(JUMP_ABSOLUTE);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1636 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1637 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1638
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1639 TARGET(SET_ADD) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1640 PyObject *v = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1641 PyObject *set = stack_pointer[-oparg];
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1642 int err;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1643 err = PySet_Add(set, v);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1644 Py_DECREF(v);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1645 if (err != 0)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1646 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1647 PREDICT(JUMP_ABSOLUTE);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1648 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1649 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1650
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1651 TARGET(INPLACE_POWER) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1652 PyObject *exp = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1653 PyObject *base = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1654 PyObject *res = PyNumber_InPlacePower(base, exp, Py_None);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1655 Py_DECREF(base);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1656 Py_DECREF(exp);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1657 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1658 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1659 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1660 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1661 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1662
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1663 TARGET(INPLACE_MULTIPLY) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1664 PyObject *right = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1665 PyObject *left = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1666 PyObject *res = PyNumber_InPlaceMultiply(left, right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1667 Py_DECREF(left);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1668 Py_DECREF(right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1669 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1670 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1671 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1672 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1673 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1674
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1675 TARGET(INPLACE_TRUE_DIVIDE) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1676 PyObject *divisor = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1677 PyObject *dividend = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1678 PyObject *quotient = PyNumber_InPlaceTrueDivide(dividend, divisor);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1679 Py_DECREF(dividend);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1680 Py_DECREF(divisor);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1681 SET_TOP(quotient);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1682 if (quotient == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1683 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1684 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1685 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1686
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1687 TARGET(INPLACE_FLOOR_DIVIDE) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1688 PyObject *divisor = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1689 PyObject *dividend = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1690 PyObject *quotient = PyNumber_InPlaceFloorDivide(dividend, divisor);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1691 Py_DECREF(dividend);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1692 Py_DECREF(divisor);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1693 SET_TOP(quotient);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1694 if (quotient == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1695 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1696 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1697 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1698
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1699 TARGET(INPLACE_MODULO) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1700 PyObject *right = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1701 PyObject *left = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1702 PyObject *mod = PyNumber_InPlaceRemainder(left, right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1703 Py_DECREF(left);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1704 Py_DECREF(right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1705 SET_TOP(mod);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1706 if (mod == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1707 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1708 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1709 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1710
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1711 TARGET(INPLACE_ADD) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1712 PyObject *right = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1713 PyObject *left = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1714 PyObject *sum;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1715 if (PyUnicode_CheckExact(left) && PyUnicode_CheckExact(right)) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1716 sum = unicode_concatenate(left, right, f, next_instr);
72605
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
1717 /* unicode_concatenate consumed the ref to v */
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
1718 }
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
1719 else {
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1720 sum = PyNumber_InPlaceAdd(left, right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1721 Py_DECREF(left);
72605
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
1722 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1723 Py_DECREF(right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1724 SET_TOP(sum);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1725 if (sum == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1726 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1727 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1728 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1729
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1730 TARGET(INPLACE_SUBTRACT) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1731 PyObject *right = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1732 PyObject *left = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1733 PyObject *diff = PyNumber_InPlaceSubtract(left, right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1734 Py_DECREF(left);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1735 Py_DECREF(right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1736 SET_TOP(diff);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1737 if (diff == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1738 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1739 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1740 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1741
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1742 TARGET(INPLACE_LSHIFT) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1743 PyObject *right = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1744 PyObject *left = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1745 PyObject *res = PyNumber_InPlaceLshift(left, right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1746 Py_DECREF(left);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1747 Py_DECREF(right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1748 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1749 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1750 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1751 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1752 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1753
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1754 TARGET(INPLACE_RSHIFT) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1755 PyObject *right = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1756 PyObject *left = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1757 PyObject *res = PyNumber_InPlaceRshift(left, right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1758 Py_DECREF(left);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1759 Py_DECREF(right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1760 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1761 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1762 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1763 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1764 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1765
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1766 TARGET(INPLACE_AND) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1767 PyObject *right = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1768 PyObject *left = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1769 PyObject *res = PyNumber_InPlaceAnd(left, right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1770 Py_DECREF(left);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1771 Py_DECREF(right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1772 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1773 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1774 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1775 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1776 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1777
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1778 TARGET(INPLACE_XOR) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1779 PyObject *right = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1780 PyObject *left = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1781 PyObject *res = PyNumber_InPlaceXor(left, right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1782 Py_DECREF(left);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1783 Py_DECREF(right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1784 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1785 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1786 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1787 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1788 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1789
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1790 TARGET(INPLACE_OR) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1791 PyObject *right = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1792 PyObject *left = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1793 PyObject *res = PyNumber_InPlaceOr(left, right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1794 Py_DECREF(left);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1795 Py_DECREF(right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1796 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1797 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1798 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1799 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1800 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1801
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1802 TARGET(STORE_SUBSCR) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1803 PyObject *sub = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1804 PyObject *container = SECOND();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1805 PyObject *v = THIRD();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1806 int err;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1807 STACKADJ(-3);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1808 /* v[w] = u */
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1809 err = PyObject_SetItem(container, sub, v);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1810 Py_DECREF(v);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1811 Py_DECREF(container);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1812 Py_DECREF(sub);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1813 if (err != 0)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1814 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1815 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1816 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1817
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1818 TARGET(DELETE_SUBSCR) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1819 PyObject *sub = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1820 PyObject *container = SECOND();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1821 int err;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1822 STACKADJ(-2);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1823 /* del v[w] */
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1824 err = PyObject_DelItem(container, sub);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1825 Py_DECREF(container);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1826 Py_DECREF(sub);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1827 if (err != 0)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1828 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1829 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1830 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1831
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1832 TARGET(PRINT_EXPR) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1833 PyObject *value = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1834 PyObject *hook = PySys_GetObject("displayhook");
79695
fb40d0ab0c77 move more variable declarations to the top of blocks
Benjamin Peterson <benjamin@python.org>
parents: 79694
diff changeset
1835 PyObject *res;
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1836 if (hook == NULL) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1837 PyErr_SetString(PyExc_RuntimeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1838 "lost sys.displayhook");
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1839 Py_DECREF(value);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1840 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1841 }
79695
fb40d0ab0c77 move more variable declarations to the top of blocks
Benjamin Peterson <benjamin@python.org>
parents: 79694
diff changeset
1842 res = PyObject_CallFunctionObjArgs(hook, value, NULL);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1843 Py_DECREF(value);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1844 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1845 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1846 Py_DECREF(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1847 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1848 }
15811
1a00d21910c8 Implementation of PEP-0217.
Moshe Zadka <moshez@math.huji.ac.il>
parents: 15809
diff changeset
1849
14163
1b9fd0cbd914 Support for three-token characters (**=, >>=, <<=) which was written by
Thomas Wouters <thomas@python.org>
parents: 14147
diff changeset
1850 #ifdef CASE_TOO_BIG
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1851 default: switch (opcode) {
14163
1b9fd0cbd914 Support for three-token characters (**=, >>=, <<=) which was written by
Thomas Wouters <thomas@python.org>
parents: 14147
diff changeset
1852 #endif
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1853 TARGET(RAISE_VARARGS) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1854 PyObject *cause = NULL, *exc = NULL;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1855 switch (oparg) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1856 case 2:
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1857 cause = POP(); /* cause */
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1858 case 1:
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1859 exc = POP(); /* exc */
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1860 case 0: /* Fallthrough */
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1861 if (do_raise(exc, cause)) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1862 why = WHY_EXCEPTION;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1863 goto fast_block_end;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1864 }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1865 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1866 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1867 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1868 "bad RAISE_VARARGS oparg");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1869 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1870 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1871 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1872 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1873
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1874 TARGET(STORE_LOCALS) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1875 PyObject *locals = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1876 PyObject *old = f->f_locals;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1877 Py_XDECREF(old);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1878 f->f_locals = locals;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1879 DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1880 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1881
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1882 TARGET(RETURN_VALUE) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1883 retval = POP();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1884 why = WHY_RETURN;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1885 goto fast_block_end;
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1886 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1887
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1888 TARGET(YIELD_FROM) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1889 PyObject *v = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1890 PyObject *reciever = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1891 int err;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1892 if (PyGen_CheckExact(reciever)) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1893 retval = _PyGen_Send((PyGenObject *)reciever, v);
75714
72556ff86828 perform yield from delegation by repeating YIELD_FROM opcode (closes #14230)
Benjamin Peterson <benjamin@python.org>
parents: 75292
diff changeset
1894 } else {
75852
5fae5be91849 use identifier api
Benjamin Peterson <benjamin@python.org>
parents: 75714
diff changeset
1895 _Py_IDENTIFIER(send);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1896 if (v == Py_None)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1897 retval = Py_TYPE(reciever)->tp_iternext(reciever);
75714
72556ff86828 perform yield from delegation by repeating YIELD_FROM opcode (closes #14230)
Benjamin Peterson <benjamin@python.org>
parents: 75292
diff changeset
1898 else
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1899 retval = _PyObject_CallMethodId(reciever, &PyId_send, "O", v);
75714
72556ff86828 perform yield from delegation by repeating YIELD_FROM opcode (closes #14230)
Benjamin Peterson <benjamin@python.org>
parents: 75292
diff changeset
1900 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1901 Py_DECREF(v);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1902 if (retval == NULL) {
75714
72556ff86828 perform yield from delegation by repeating YIELD_FROM opcode (closes #14230)
Benjamin Peterson <benjamin@python.org>
parents: 75292
diff changeset
1903 PyObject *val;
77476
cfbf6aa5c9e3 Issue #13783: the PEP 380 implementation no longer expands the public C API
Nick Coghlan <ncoghlan@gmail.com>
parents: 77283
diff changeset
1904 err = _PyGen_FetchStopIterationValue(&val);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1905 if (err < 0)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1906 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1907 Py_DECREF(reciever);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1908 SET_TOP(val);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1909 DISPATCH();
74356
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682)
Nick Coghlan <ncoghlan@gmail.com>
parents: 73738
diff changeset
1910 }
75714
72556ff86828 perform yield from delegation by repeating YIELD_FROM opcode (closes #14230)
Benjamin Peterson <benjamin@python.org>
parents: 75292
diff changeset
1911 /* x remains on stack, retval is value to be yielded */
74356
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682)
Nick Coghlan <ncoghlan@gmail.com>
parents: 73738
diff changeset
1912 f->f_stacktop = stack_pointer;
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682)
Nick Coghlan <ncoghlan@gmail.com>
parents: 73738
diff changeset
1913 why = WHY_YIELD;
75714
72556ff86828 perform yield from delegation by repeating YIELD_FROM opcode (closes #14230)
Benjamin Peterson <benjamin@python.org>
parents: 75292
diff changeset
1914 /* and repeat... */
72556ff86828 perform yield from delegation by repeating YIELD_FROM opcode (closes #14230)
Benjamin Peterson <benjamin@python.org>
parents: 75292
diff changeset
1915 f->f_lasti--;
74356
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682)
Nick Coghlan <ncoghlan@gmail.com>
parents: 73738
diff changeset
1916 goto fast_yield;
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1917 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1918
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1919 TARGET(YIELD_VALUE) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1920 retval = POP();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1921 f->f_stacktop = stack_pointer;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1922 why = WHY_YIELD;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1923 goto fast_yield;
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1924 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1925
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1926 TARGET(POP_EXCEPT) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1927 PyTryBlock *b = PyFrame_BlockPop(f);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1928 if (b->b_type != EXCEPT_HANDLER) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1929 PyErr_SetString(PyExc_SystemError,
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1930 "popped block is not an except handler");
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1931 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1932 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1933 UNWIND_EXCEPT_HANDLER(b);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1934 DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1935 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1936
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1937 TARGET(POP_BLOCK) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1938 PyTryBlock *b = PyFrame_BlockPop(f);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1939 UNWIND_BLOCK(b);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1940 DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1941 }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1942
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1943 PREDICTED(END_FINALLY);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1944 TARGET(END_FINALLY) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1945 PyObject *status = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1946 if (PyLong_Check(status)) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1947 why = (enum why_code) PyLong_AS_LONG(status);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1948 assert(why != WHY_YIELD && why != WHY_EXCEPTION);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1949 if (why == WHY_RETURN ||
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1950 why == WHY_CONTINUE)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1951 retval = POP();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1952 if (why == WHY_SILENCED) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1953 /* An exception was silenced by 'with', we must
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1954 manually unwind the EXCEPT_HANDLER block which was
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1955 created when the exception was caught, otherwise
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1956 the stack will be in an inconsistent state. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1957 PyTryBlock *b = PyFrame_BlockPop(f);
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
1958 assert(b->b_type == EXCEPT_HANDLER);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
1959 UNWIND_EXCEPT_HANDLER(b);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
1960 why = WHY_NOT;
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1961 Py_DECREF(status);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1962 DISPATCH();
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1963 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1964 Py_DECREF(status);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1965 goto fast_block_end;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1966 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1967 else if (PyExceptionClass_Check(status)) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1968 PyObject *exc = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1969 PyObject *tb = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1970 PyErr_Restore(status, exc, tb);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1971 why = WHY_EXCEPTION;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1972 goto fast_block_end;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1973 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1974 else if (status != Py_None) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1975 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1976 "'finally' pops bad exception");
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1977 Py_DECREF(status);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1978 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
1979 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1980 Py_DECREF(status);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1981 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1982 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1983
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1984 TARGET(LOAD_BUILD_CLASS) {
75959
c67f3681e032 Issue #14383: Add _PyDict_GetItemId() and _PyDict_SetItemId() functions
Victor Stinner <victor.stinner@gmail.com>
parents: 75852
diff changeset
1985 _Py_IDENTIFIER(__build_class__);
76411
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
1986
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1987 PyObject *bc;
76411
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
1988 if (PyDict_CheckExact(f->f_builtins)) {
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1989 bc = _PyDict_GetItemId(f->f_builtins, &PyId___build_class__);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1990 if (bc == NULL) {
76411
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
1991 PyErr_SetString(PyExc_NameError,
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
1992 "__build_class__ not found");
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1993 goto error;
76411
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
1994 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
1995 Py_INCREF(bc);
76411
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
1996 }
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
1997 else {
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
1998 PyObject *build_class_str = _PyUnicode_FromId(&PyId___build_class__);
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
1999 if (build_class_str == NULL)
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
2000 break;
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2001 bc = PyObject_GetItem(f->f_builtins, build_class_str);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2002 if (bc == NULL) {
76411
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
2003 if (PyErr_ExceptionMatches(PyExc_KeyError))
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
2004 PyErr_SetString(PyExc_NameError,
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
2005 "__build_class__ not found");
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2006 goto error;
76411
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
2007 }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2008 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2009 PUSH(bc);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2010 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2011 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2012
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2013 TARGET(STORE_NAME) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2014 PyObject *name = GETITEM(names, oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2015 PyObject *v = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2016 PyObject *ns = f->f_locals;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2017 int err;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2018 if (ns == NULL) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2019 PyErr_Format(PyExc_SystemError,
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2020 "no locals found when storing %R", name);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2021 Py_DECREF(v);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2022 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2023 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2024 if (PyDict_CheckExact(ns))
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2025 err = PyDict_SetItem(ns, name, v);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2026 else
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2027 err = PyObject_SetItem(ns, name, v);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2028 Py_DECREF(v);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2029 if (err != 0)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2030 goto error;
79650
5a13f9b842b1 add some missing DISPATCH()
Benjamin Peterson <benjamin@python.org>
parents: 78458
diff changeset
2031 DISPATCH();
75959
c67f3681e032 Issue #14383: Add _PyDict_GetItemId() and _PyDict_SetItemId() functions
Victor Stinner <victor.stinner@gmail.com>
parents: 75852
diff changeset
2032 }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2033
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2034 TARGET(DELETE_NAME) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2035 PyObject *name = GETITEM(names, oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2036 PyObject *ns = f->f_locals;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2037 int err;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2038 if (ns == NULL) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2039 PyErr_Format(PyExc_SystemError,
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2040 "no locals when deleting %R", name);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2041 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2042 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2043 err = PyObject_DelItem(ns, name);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2044 if (err != 0) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2045 format_exc_check_arg(PyExc_NameError,
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2046 NAME_ERROR_MSG,
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2047 name);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2048 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2049 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2050 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2051 }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2052
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2053 PREDICTED_WITH_ARG(UNPACK_SEQUENCE);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2054 TARGET(UNPACK_SEQUENCE) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2055 PyObject *seq = POP(), *item, **items;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2056 if (PyTuple_CheckExact(seq) &&
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2057 PyTuple_GET_SIZE(seq) == oparg) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2058 items = ((PyTupleObject *)seq)->ob_item;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2059 while (oparg--) {
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2060 item = items[oparg];
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2061 Py_INCREF(item);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2062 PUSH(item);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2063 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2064 } else if (PyList_CheckExact(seq) &&
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2065 PyList_GET_SIZE(seq) == oparg) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2066 items = ((PyListObject *)seq)->ob_item;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2067 while (oparg--) {
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2068 item = items[oparg];
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2069 Py_INCREF(item);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2070 PUSH(item);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2071 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2072 } else if (unpack_iterable(seq, oparg, -1,
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2073 stack_pointer + oparg)) {
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2074 STACKADJ(oparg);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2075 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2076 /* unpack_iterable() raised an exception */
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2077 Py_DECREF(seq);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2078 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2079 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2080 Py_DECREF(seq);
79650
5a13f9b842b1 add some missing DISPATCH()
Benjamin Peterson <benjamin@python.org>
parents: 78458
diff changeset
2081 DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2082 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2083
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2084 TARGET(UNPACK_EX) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2085 int totalargs = 1 + (oparg & 0xFF) + (oparg >> 8);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2086 PyObject *seq = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2087
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2088 if (unpack_iterable(seq, oparg & 0xFF, oparg >> 8,
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2089 stack_pointer + totalargs)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2090 stack_pointer += totalargs;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2091 } else {
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2092 Py_DECREF(seq);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2093 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2094 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2095 Py_DECREF(seq);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2096 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2097 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2098
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2099 TARGET(STORE_ATTR) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2100 PyObject *name = GETITEM(names, oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2101 PyObject *owner = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2102 PyObject *v = SECOND();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2103 int err;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2104 STACKADJ(-2);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2105 err = PyObject_SetAttr(owner, name, v);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2106 Py_DECREF(v);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2107 Py_DECREF(owner);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2108 if (err != 0)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2109 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2110 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2111 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2112
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2113 TARGET(DELETE_ATTR) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2114 PyObject *name = GETITEM(names, oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2115 PyObject *owner = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2116 int err;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2117 err = PyObject_SetAttr(owner, name, (PyObject *)NULL);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2118 Py_DECREF(owner);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2119 if (err != 0)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2120 goto error;
79650
5a13f9b842b1 add some missing DISPATCH()
Benjamin Peterson <benjamin@python.org>
parents: 78458
diff changeset
2121 DISPATCH();
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2122 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2123
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2124 TARGET(STORE_GLOBAL) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2125 PyObject *name = GETITEM(names, oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2126 PyObject *v = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2127 int err;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2128 err = PyDict_SetItem(f->f_globals, name, v);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2129 Py_DECREF(v);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2130 if (err != 0)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2131 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2132 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2133 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2134
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2135 TARGET(DELETE_GLOBAL) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2136 PyObject *name = GETITEM(names, oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2137 int err;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2138 err = PyDict_DelItem(f->f_globals, name);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2139 if (err != 0) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2140 format_exc_check_arg(
82459
f1d3fbcd837d #17032: The "global" in the "NameError: global name 'x' is not defined" error message has been removed. Patch by Ram Rachum.
Ezio Melotti <ezio.melotti@gmail.com>
parents: 82133
diff changeset
2141 PyExc_NameError, NAME_ERROR_MSG, name);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2142 goto error;
79650
5a13f9b842b1 add some missing DISPATCH()
Benjamin Peterson <benjamin@python.org>
parents: 78458
diff changeset
2143 }
5a13f9b842b1 add some missing DISPATCH()
Benjamin Peterson <benjamin@python.org>
parents: 78458
diff changeset
2144 DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2145 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2146
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2147 TARGET(LOAD_NAME) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2148 PyObject *name = GETITEM(names, oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2149 PyObject *locals = f->f_locals;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2150 PyObject *v;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2151 if (locals == NULL) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2152 PyErr_Format(PyExc_SystemError,
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2153 "no locals when loading %R", name);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2154 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2155 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2156 if (PyDict_CheckExact(locals)) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2157 v = PyDict_GetItem(locals, name);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2158 Py_XINCREF(v);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2159 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2160 else {
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2161 v = PyObject_GetItem(locals, name);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2162 if (v == NULL && PyErr_Occurred()) {
80857
bb6fd6f021e7 use error label instead of breaking eval loop (closes #16693)
Benjamin Peterson <benjamin@python.org>
parents: 79695
diff changeset
2163 if (!PyErr_ExceptionMatches(PyExc_KeyError))
bb6fd6f021e7 use error label instead of breaking eval loop (closes #16693)
Benjamin Peterson <benjamin@python.org>
parents: 79695
diff changeset
2164 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2165 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2166 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2167 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2168 if (v == NULL) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2169 v = PyDict_GetItem(f->f_globals, name);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2170 Py_XINCREF(v);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2171 if (v == NULL) {
76411
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
2172 if (PyDict_CheckExact(f->f_builtins)) {
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2173 v = PyDict_GetItem(f->f_builtins, name);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2174 if (v == NULL) {
76411
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
2175 format_exc_check_arg(
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
2176 PyExc_NameError,
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2177 NAME_ERROR_MSG, name);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2178 goto error;
76411
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
2179 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2180 Py_INCREF(v);
76411
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
2181 }
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
2182 else {
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2183 v = PyObject_GetItem(f->f_builtins, name);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2184 if (v == NULL) {
76411
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
2185 if (PyErr_ExceptionMatches(PyExc_KeyError))
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
2186 format_exc_check_arg(
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
2187 PyExc_NameError,
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2188 NAME_ERROR_MSG, name);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2189 goto error;
76411
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
2190 }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2191 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2192 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2193 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2194 PUSH(v);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2195 DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2196 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2197
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2198 TARGET(LOAD_GLOBAL) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2199 PyObject *name = GETITEM(names, oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2200 PyObject *v;
76411
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
2201 if (PyDict_CheckExact(f->f_globals)
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
2202 && PyDict_CheckExact(f->f_builtins)) {
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2203 v = _PyDict_LoadGlobal((PyDictObject *)f->f_globals,
76485
6e5855854a2e Implement PEP 412: Key-sharing dictionaries (closes #13903)
Benjamin Peterson <benjamin@python.org>
parents: 76419
diff changeset
2204 (PyDictObject *)f->f_builtins,
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2205 name);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2206 if (v == NULL) {
76485
6e5855854a2e Implement PEP 412: Key-sharing dictionaries (closes #13903)
Benjamin Peterson <benjamin@python.org>
parents: 76419
diff changeset
2207 if (!PyErr_Occurred())
6e5855854a2e Implement PEP 412: Key-sharing dictionaries (closes #13903)
Benjamin Peterson <benjamin@python.org>
parents: 76419
diff changeset
2208 format_exc_check_arg(PyExc_NameError,
82459
f1d3fbcd837d #17032: The "global" in the "NameError: global name 'x' is not defined" error message has been removed. Patch by Ram Rachum.
Ezio Melotti <ezio.melotti@gmail.com>
parents: 82133
diff changeset
2209 NAME_ERROR_MSG, name);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2210 goto error;
76411
e3ab8aa0216c Issue #14385: Support other types than dict for __builtins__
Victor Stinner <victor.stinner@gmail.com>
parents: 76072
diff changeset
2211 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2212 Py_INCREF(v);
76485
6e5855854a2e Implement PEP 412: Key-sharing dictionaries (closes #13903)
Benjamin Peterson <benjamin@python.org>
parents: 76419
diff changeset
2213 }
6e5855854a2e Implement PEP 412: Key-sharing dictionaries (closes #13903)
Benjamin Peterson <benjamin@python.org>
parents: 76419
diff changeset
2214 else {
6e5855854a2e Implement PEP 412: Key-sharing dictionaries (closes #13903)
Benjamin Peterson <benjamin@python.org>
parents: 76419
diff changeset
2215 /* Slow-path if globals or builtins is not a dict */
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2216 v = PyObject_GetItem(f->f_globals, name);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2217 if (v == NULL) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2218 v = PyObject_GetItem(f->f_builtins, name);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2219 if (v == NULL) {
76485
6e5855854a2e Implement PEP 412: Key-sharing dictionaries (closes #13903)
Benjamin Peterson <benjamin@python.org>
parents: 76419
diff changeset
2220 if (PyErr_ExceptionMatches(PyExc_KeyError))
6e5855854a2e Implement PEP 412: Key-sharing dictionaries (closes #13903)
Benjamin Peterson <benjamin@python.org>
parents: 76419
diff changeset
2221 format_exc_check_arg(
6e5855854a2e Implement PEP 412: Key-sharing dictionaries (closes #13903)
Benjamin Peterson <benjamin@python.org>
parents: 76419
diff changeset
2222 PyExc_NameError,
82459
f1d3fbcd837d #17032: The "global" in the "NameError: global name 'x' is not defined" error message has been removed. Patch by Ram Rachum.
Ezio Melotti <ezio.melotti@gmail.com>
parents: 82133
diff changeset
2223 NAME_ERROR_MSG, name);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2224 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2225 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2226 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2227 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2228 PUSH(v);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2229 DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2230 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2231
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2232 TARGET(DELETE_FAST) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2233 PyObject *v = GETLOCAL(oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2234 if (v != NULL) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2235 SETLOCAL(oparg, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2236 DISPATCH();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2237 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2238 format_exc_check_arg(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2239 PyExc_UnboundLocalError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2240 UNBOUNDLOCAL_ERROR_MSG,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2241 PyTuple_GetItem(co->co_varnames, oparg)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2242 );
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2243 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2244 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2245
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2246 TARGET(DELETE_DEREF) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2247 PyObject *cell = freevars[oparg];
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2248 if (PyCell_GET(cell) != NULL) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2249 PyCell_Set(cell, NULL);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2250 DISPATCH();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2251 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2252 format_exc_unbound(co, oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2253 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2254 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2255
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2256 TARGET(LOAD_CLOSURE) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2257 PyObject *cell = freevars[oparg];
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2258 Py_INCREF(cell);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2259 PUSH(cell);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2260 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2261 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2262
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2263 TARGET(LOAD_DEREF) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2264 PyObject *cell = freevars[oparg];
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2265 PyObject *value = PyCell_GET(cell);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2266 if (value == NULL) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2267 format_exc_unbound(co, oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2268 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2269 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2270 Py_INCREF(value);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2271 PUSH(value);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2272 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2273 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2274
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2275 TARGET(STORE_DEREF) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2276 PyObject *v = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2277 PyObject *cell = freevars[oparg];
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2278 PyCell_Set(cell, v);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2279 Py_DECREF(v);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2280 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2281 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2282
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2283 TARGET(BUILD_TUPLE) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2284 PyObject *tup = PyTuple_New(oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2285 if (tup == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2286 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2287 while (--oparg >= 0) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2288 PyObject *item = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2289 PyTuple_SET_ITEM(tup, oparg, item);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2290 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2291 PUSH(tup);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2292 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2293 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2294
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2295 TARGET(BUILD_LIST) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2296 PyObject *list = PyList_New(oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2297 if (list == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2298 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2299 while (--oparg >= 0) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2300 PyObject *item = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2301 PyList_SET_ITEM(list, oparg, item);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2302 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2303 PUSH(list);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2304 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2305 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2306
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2307 TARGET(BUILD_SET) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2308 PyObject *set = PySet_New(NULL);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2309 int err = 0;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2310 if (set == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2311 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2312 while (--oparg >= 0) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2313 PyObject *item = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2314 if (err == 0)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2315 err = PySet_Add(set, item);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2316 Py_DECREF(item);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2317 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2318 if (err != 0) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2319 Py_DECREF(set);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2320 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2321 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2322 PUSH(set);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2323 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2324 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2325
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2326 TARGET(BUILD_MAP) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2327 PyObject *map = _PyDict_NewPresized((Py_ssize_t)oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2328 if (map == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2329 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2330 PUSH(map);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2331 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2332 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2333
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2334 TARGET(STORE_MAP) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2335 PyObject *key = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2336 PyObject *value = SECOND();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2337 PyObject *map = THIRD();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2338 int err;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2339 STACKADJ(-2);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2340 assert(PyDict_CheckExact(map));
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2341 err = PyDict_SetItem(map, key, value);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2342 Py_DECREF(value);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2343 Py_DECREF(key);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2344 if (err != 0)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2345 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2346 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2347 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2348
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2349 TARGET(MAP_ADD) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2350 PyObject *key = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2351 PyObject *value = SECOND();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2352 PyObject *map;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2353 int err;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2354 STACKADJ(-2);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2355 map = stack_pointer[-oparg]; /* dict */
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2356 assert(PyDict_CheckExact(map));
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2357 err = PyDict_SetItem(map, key, value); /* v[w] = u */
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2358 Py_DECREF(value);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2359 Py_DECREF(key);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2360 if (err != 0)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2361 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2362 PREDICT(JUMP_ABSOLUTE);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2363 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2364 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2365
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2366 TARGET(LOAD_ATTR) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2367 PyObject *name = GETITEM(names, oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2368 PyObject *owner = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2369 PyObject *res = PyObject_GetAttr(owner, name);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2370 Py_DECREF(owner);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2371 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2372 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2373 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2374 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2375 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2376
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2377 TARGET(COMPARE_OP) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2378 PyObject *right = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2379 PyObject *left = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2380 PyObject *res = cmp_outcome(oparg, left, right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2381 Py_DECREF(left);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2382 Py_DECREF(right);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2383 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2384 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2385 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2386 PREDICT(POP_JUMP_IF_FALSE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2387 PREDICT(POP_JUMP_IF_TRUE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2388 DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2389 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2390
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2391 TARGET(IMPORT_NAME) {
75959
c67f3681e032 Issue #14383: Add _PyDict_GetItemId() and _PyDict_SetItemId() functions
Victor Stinner <victor.stinner@gmail.com>
parents: 75852
diff changeset
2392 _Py_IDENTIFIER(__import__);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2393 PyObject *name = GETITEM(names, oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2394 PyObject *func = _PyDict_GetItemId(f->f_builtins, &PyId___import__);
79695
fb40d0ab0c77 move more variable declarations to the top of blocks
Benjamin Peterson <benjamin@python.org>
parents: 79694
diff changeset
2395 PyObject *from, *level, *args, *res;
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2396 if (func == NULL) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2397 PyErr_SetString(PyExc_ImportError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2398 "__import__ not found");
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2399 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2400 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2401 Py_INCREF(func);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2402 from = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2403 level = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2404 if (PyLong_AsLong(level) != -1 || PyErr_Occurred())
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2405 args = PyTuple_Pack(5,
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2406 name,
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2407 f->f_globals,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2408 f->f_locals == NULL ?
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2409 Py_None : f->f_locals,
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2410 from,
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2411 level);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2412 else
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2413 args = PyTuple_Pack(4,
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2414 name,
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2415 f->f_globals,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2416 f->f_locals == NULL ?
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2417 Py_None : f->f_locals,
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2418 from);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2419 Py_DECREF(level);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2420 Py_DECREF(from);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2421 if (args == NULL) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2422 Py_DECREF(func);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2423 STACKADJ(-1);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2424 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2425 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2426 READ_TIMESTAMP(intr0);
79695
fb40d0ab0c77 move more variable declarations to the top of blocks
Benjamin Peterson <benjamin@python.org>
parents: 79694
diff changeset
2427 res = PyEval_CallObject(func, args);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2428 READ_TIMESTAMP(intr1);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2429 Py_DECREF(args);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2430 Py_DECREF(func);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2431 SET_TOP(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2432 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2433 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2434 DISPATCH();
75959
c67f3681e032 Issue #14383: Add _PyDict_GetItemId() and _PyDict_SetItemId() functions
Victor Stinner <victor.stinner@gmail.com>
parents: 75852
diff changeset
2435 }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2436
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2437 TARGET(IMPORT_STAR) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2438 PyObject *from = POP(), *locals;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2439 int err;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2440 PyFrame_FastToLocals(f);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2441 locals = f->f_locals;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2442 if (locals == NULL) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2443 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2444 "no locals found during 'import *'");
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2445 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2446 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2447 READ_TIMESTAMP(intr0);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2448 err = import_all_from(locals, from);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2449 READ_TIMESTAMP(intr1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2450 PyFrame_LocalsToFast(f, 0);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2451 Py_DECREF(from);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2452 if (err != 0)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2453 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2454 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2455 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2456
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2457 TARGET(IMPORT_FROM) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2458 PyObject *name = GETITEM(names, oparg);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2459 PyObject *from = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2460 PyObject *res;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2461 READ_TIMESTAMP(intr0);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2462 res = import_from(from, name);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2463 READ_TIMESTAMP(intr1);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2464 PUSH(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2465 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2466 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2467 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2468 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2469
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2470 TARGET(JUMP_FORWARD) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2471 JUMPBY(oparg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2472 FAST_DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2473 }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2474
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2475 PREDICTED_WITH_ARG(POP_JUMP_IF_FALSE);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2476 TARGET(POP_JUMP_IF_FALSE) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2477 PyObject *cond = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2478 int err;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2479 if (cond == Py_True) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2480 Py_DECREF(cond);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2481 FAST_DISPATCH();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2482 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2483 if (cond == Py_False) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2484 Py_DECREF(cond);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2485 JUMPTO(oparg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2486 FAST_DISPATCH();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2487 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2488 err = PyObject_IsTrue(cond);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2489 Py_DECREF(cond);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2490 if (err > 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2491 err = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2492 else if (err == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2493 JUMPTO(oparg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2494 else
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2495 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2496 DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2497 }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2498
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2499 PREDICTED_WITH_ARG(POP_JUMP_IF_TRUE);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2500 TARGET(POP_JUMP_IF_TRUE) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2501 PyObject *cond = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2502 int err;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2503 if (cond == Py_False) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2504 Py_DECREF(cond);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2505 FAST_DISPATCH();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2506 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2507 if (cond == Py_True) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2508 Py_DECREF(cond);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2509 JUMPTO(oparg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2510 FAST_DISPATCH();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2511 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2512 err = PyObject_IsTrue(cond);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2513 Py_DECREF(cond);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2514 if (err > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2515 err = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2516 JUMPTO(oparg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2517 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2518 else if (err == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2519 ;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2520 else
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2521 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2522 DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2523 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2524
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2525 TARGET(JUMP_IF_FALSE_OR_POP) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2526 PyObject *cond = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2527 int err;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2528 if (cond == Py_True) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2529 STACKADJ(-1);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2530 Py_DECREF(cond);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2531 FAST_DISPATCH();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2532 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2533 if (cond == Py_False) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2534 JUMPTO(oparg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2535 FAST_DISPATCH();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2536 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2537 err = PyObject_IsTrue(cond);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2538 if (err > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2539 STACKADJ(-1);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2540 Py_DECREF(cond);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2541 err = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2542 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2543 else if (err == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2544 JUMPTO(oparg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2545 else
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2546 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2547 DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2548 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2549
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2550 TARGET(JUMP_IF_TRUE_OR_POP) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2551 PyObject *cond = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2552 int err;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2553 if (cond == Py_False) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2554 STACKADJ(-1);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2555 Py_DECREF(cond);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2556 FAST_DISPATCH();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2557 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2558 if (cond == Py_True) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2559 JUMPTO(oparg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2560 FAST_DISPATCH();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2561 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2562 err = PyObject_IsTrue(cond);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2563 if (err > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2564 err = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2565 JUMPTO(oparg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2566 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2567 else if (err == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2568 STACKADJ(-1);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2569 Py_DECREF(cond);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2570 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2571 else
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2572 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2573 DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2574 }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2575
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2576 PREDICTED_WITH_ARG(JUMP_ABSOLUTE);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2577 TARGET(JUMP_ABSOLUTE) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2578 JUMPTO(oparg);
43815
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from
Guido van Rossum <guido@python.org>
parents: 43777
diff changeset
2579 #if FAST_LOOPS
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2580 /* Enabling this path speeds-up all while and for-loops by bypassing
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2581 the per-loop checks for signals. By default, this should be turned-off
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2582 because it prevents detection of a control-break in tight loops like
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2583 "while 1: pass". Compile with this option turned-on when you need
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2584 the speed-up and do not need break checking inside tight loops (ones
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2585 that contain only instructions ending with FAST_DISPATCH).
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2586 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2587 FAST_DISPATCH();
43815
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from
Guido van Rossum <guido@python.org>
parents: 43777
diff changeset
2588 #else
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2589 DISPATCH();
43815
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from
Guido van Rossum <guido@python.org>
parents: 43777
diff changeset
2590 #endif
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2591 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2592
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2593 TARGET(GET_ITER) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2594 /* before: [obj]; after [getiter(obj)] */
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2595 PyObject *iterable = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2596 PyObject *iter = PyObject_GetIter(iterable);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2597 Py_DECREF(iterable);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2598 SET_TOP(iter);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2599 if (iter == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2600 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2601 PREDICT(FOR_ITER);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2602 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2603 }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2604
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2605 PREDICTED_WITH_ARG(FOR_ITER);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2606 TARGET(FOR_ITER) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2607 /* before: [iter]; after: [iter, iter()] *or* [] */
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2608 PyObject *iter = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2609 PyObject *next = (*iter->ob_type->tp_iternext)(iter);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2610 if (next != NULL) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2611 PUSH(next);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2612 PREDICT(STORE_FAST);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2613 PREDICT(UNPACK_SEQUENCE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2614 DISPATCH();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2615 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2616 if (PyErr_Occurred()) {
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2617 if (!PyErr_ExceptionMatches(PyExc_StopIteration))
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2618 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2619 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2620 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2621 /* iterator ended normally */
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2622 STACKADJ(-1);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2623 Py_DECREF(iter);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2624 JUMPBY(oparg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2625 DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2626 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2627
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2628 TARGET(BREAK_LOOP) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2629 why = WHY_BREAK;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2630 goto fast_block_end;
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2631 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2632
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2633 TARGET(CONTINUE_LOOP) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2634 retval = PyLong_FromLong(oparg);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2635 if (retval == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2636 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2637 why = WHY_CONTINUE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2638 goto fast_block_end;
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2639 }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2640
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2641 TARGET_WITH_IMPL(SETUP_LOOP, _setup_finally)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2642 TARGET_WITH_IMPL(SETUP_EXCEPT, _setup_finally)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2643 TARGET(SETUP_FINALLY)
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2644 _setup_finally: {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2645 /* NOTE: If you add any new block-setup opcodes that
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2646 are not try/except/finally handlers, you may need
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2647 to update the PyGen_NeedsFinalizing() function.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2648 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2649
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2650 PyFrame_BlockSetup(f, opcode, INSTR_OFFSET() + oparg,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2651 STACK_LEVEL());
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2652 DISPATCH();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2653 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2654
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2655 TARGET(SETUP_WITH) {
74578
7d96679c5d46 use the static identifier api for looking up special methods
Benjamin Peterson <benjamin@python.org>
parents: 74367
diff changeset
2656 _Py_IDENTIFIER(__exit__);
7d96679c5d46 use the static identifier api for looking up special methods
Benjamin Peterson <benjamin@python.org>
parents: 74367
diff changeset
2657 _Py_IDENTIFIER(__enter__);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2658 PyObject *mgr = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2659 PyObject *exit = special_lookup(mgr, &PyId___exit__), *enter;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2660 PyObject *res;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2661 if (exit == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2662 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2663 SET_TOP(exit);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2664 enter = special_lookup(mgr, &PyId___enter__);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2665 Py_DECREF(mgr);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2666 if (enter == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2667 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2668 res = PyObject_CallFunctionObjArgs(enter, NULL);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2669 Py_DECREF(enter);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2670 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2671 goto error;
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2672 /* Setup the finally block before pushing the result
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2673 of __enter__ on the stack. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2674 PyFrame_BlockSetup(f, SETUP_FINALLY, INSTR_OFFSET() + oparg,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2675 STACK_LEVEL());
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2676
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2677 PUSH(res);
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2678 DISPATCH();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2679 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2680
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2681 TARGET(WITH_CLEANUP) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2682 /* At the top of the stack are 1-3 values indicating
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2683 how/why we entered the finally clause:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2684 - TOP = None
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2685 - (TOP, SECOND) = (WHY_{RETURN,CONTINUE}), retval
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2686 - TOP = WHY_*; no retval below it
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2687 - (TOP, SECOND, THIRD) = exc_info()
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2688 (FOURTH, FITH, SIXTH) = previous exception for EXCEPT_HANDLER
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2689 Below them is EXIT, the context.__exit__ bound method.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2690 In the last case, we must call
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2691 EXIT(TOP, SECOND, THIRD)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2692 otherwise we must call
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2693 EXIT(None, None, None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2694
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2695 In the first two cases, we remove EXIT from the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2696 stack, leaving the rest in the same order. In the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2697 third case, we shift the bottom 3 values of the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2698 stack down, and replace the empty spot with NULL.
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2699
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2700 In addition, if the stack represents an exception,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2701 *and* the function call returns a 'true' value, we
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2702 push WHY_SILENCED onto the stack. END_FINALLY will
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2703 then not re-raise the exception. (But non-local
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2704 gotos should still be resumed.)
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2705 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2706
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2707 PyObject *exit_func;
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2708 PyObject *exc = TOP(), *val = Py_None, *tb = Py_None, *res;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2709 int err;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2710 if (exc == Py_None) {
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2711 (void)POP();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2712 exit_func = TOP();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2713 SET_TOP(exc);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2714 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2715 else if (PyLong_Check(exc)) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2716 STACKADJ(-1);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2717 switch (PyLong_AsLong(exc)) {
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2718 case WHY_RETURN:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2719 case WHY_CONTINUE:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2720 /* Retval in TOP. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2721 exit_func = SECOND();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2722 SET_SECOND(TOP());
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2723 SET_TOP(exc);
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2724 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2725 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2726 exit_func = TOP();
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2727 SET_TOP(exc);
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2728 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2729 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2730 exc = Py_None;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2731 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2732 else {
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2733 PyObject *tp2, *exc2, *tb2;
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2734 PyTryBlock *block;
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2735 val = SECOND();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2736 tb = THIRD();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2737 tp2 = FOURTH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2738 exc2 = PEEK(5);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2739 tb2 = PEEK(6);
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2740 exit_func = PEEK(7);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2741 SET_VALUE(7, tb2);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2742 SET_VALUE(6, exc2);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2743 SET_VALUE(5, tp2);
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2744 /* UNWIND_EXCEPT_HANDLER will pop this off. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2745 SET_FOURTH(NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2746 /* We just shifted the stack down, so we have
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2747 to tell the except handler block that the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2748 values are lower than it expects. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2749 block = &f->f_blockstack[f->f_iblock - 1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2750 assert(block->b_type == EXCEPT_HANDLER);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2751 block->b_level--;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2752 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2753 /* XXX Not the fastest way to call it... */
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2754 res = PyObject_CallFunctionObjArgs(exit_func, exc, val, tb, NULL);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2755 Py_DECREF(exit_func);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2756 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2757 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2758
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2759 if (exc != Py_None)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2760 err = PyObject_IsTrue(res);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2761 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2762 err = 0;
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2763 Py_DECREF(res);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2764
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2765 if (err < 0)
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2766 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2767 else if (err > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2768 err = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2769 /* There was an exception and a True return */
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2770 PUSH(PyLong_FromLong((long) WHY_SILENCED));
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2771 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2772 PREDICT(END_FINALLY);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2773 DISPATCH();
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2774 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2775
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2776 TARGET(CALL_FUNCTION) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2777 PyObject **sp, *res;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2778 PCALL(PCALL_ALL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2779 sp = stack_pointer;
32301
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
2780 #ifdef WITH_TSC
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2781 res = call_function(&sp, oparg, &intr0, &intr1);
32301
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
2782 #else
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2783 res = call_function(&sp, oparg);
32301
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
2784 #endif
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2785 stack_pointer = sp;
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2786 PUSH(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2787 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2788 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2789 DISPATCH();
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2790 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2791
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2792 TARGET_WITH_IMPL(CALL_FUNCTION_VAR, _call_function_var_kw)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2793 TARGET_WITH_IMPL(CALL_FUNCTION_KW, _call_function_var_kw)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2794 TARGET(CALL_FUNCTION_VAR_KW)
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2795 _call_function_var_kw: {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2796 int na = oparg & 0xff;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2797 int nk = (oparg>>8) & 0xff;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2798 int flags = (opcode - CALL_FUNCTION) & 3;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2799 int n = na + 2 * nk;
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2800 PyObject **pfunc, *func, **sp, *res;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2801 PCALL(PCALL_ALL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2802 if (flags & CALL_FLAG_VAR)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2803 n++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2804 if (flags & CALL_FLAG_KW)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2805 n++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2806 pfunc = stack_pointer - n - 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2807 func = *pfunc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2808
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2809 if (PyMethod_Check(func)
62462
0e4637ea20d0 Merged revisions 82181 via svnmerge from
Stefan Krah <stefan@bytereef.org>
parents: 61467
diff changeset
2810 && PyMethod_GET_SELF(func) != NULL) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2811 PyObject *self = PyMethod_GET_SELF(func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2812 Py_INCREF(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2813 func = PyMethod_GET_FUNCTION(func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2814 Py_INCREF(func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2815 Py_DECREF(*pfunc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2816 *pfunc = self;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2817 na++;
68102
e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254.
Brett Cannon <bcannon@gmail.com>
parents: 68086
diff changeset
2818 /* n++; */
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2819 } else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2820 Py_INCREF(func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2821 sp = stack_pointer;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2822 READ_TIMESTAMP(intr0);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2823 res = ext_do_call(func, &sp, flags, na, nk);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2824 READ_TIMESTAMP(intr1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2825 stack_pointer = sp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2826 Py_DECREF(func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2827
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2828 while (stack_pointer > pfunc) {
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2829 PyObject *o = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2830 Py_DECREF(o);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2831 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2832 PUSH(res);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2833 if (res == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2834 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2835 DISPATCH();
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2836 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2837
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2838 TARGET_WITH_IMPL(MAKE_CLOSURE, _make_function)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2839 TARGET(MAKE_FUNCTION)
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2840 _make_function: {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2841 int posdefaults = oparg & 0xff;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2842 int kwdefaults = (oparg>>8) & 0xff;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2843 int num_annotations = (oparg >> 16) & 0x7fff;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2844
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2845 PyObject *qualname = POP(); /* qualname */
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2846 PyObject *code = POP(); /* code object */
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2847 PyObject *func = PyFunction_NewWithQualName(code, f->f_globals, qualname);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2848 Py_DECREF(code);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2849 Py_DECREF(qualname);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2850
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2851 if (func == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2852 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2853
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2854 if (opcode == MAKE_CLOSURE) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2855 PyObject *closure = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2856 if (PyFunction_SetClosure(func, closure) != 0) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2857 /* Can't happen unless bytecode is corrupt. */
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2858 Py_DECREF(func);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2859 Py_DECREF(closure);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2860 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2861 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2862 Py_DECREF(closure);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2863 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2864
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2865 if (num_annotations > 0) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2866 Py_ssize_t name_ix;
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2867 PyObject *names = POP(); /* names of args with annotations */
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2868 PyObject *anns = PyDict_New();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2869 if (anns == NULL) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2870 Py_DECREF(func);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2871 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2872 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2873 name_ix = PyTuple_Size(names);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2874 assert(num_annotations == name_ix+1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2875 while (name_ix > 0) {
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2876 PyObject *name, *value;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2877 int err;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2878 --name_ix;
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2879 name = PyTuple_GET_ITEM(names, name_ix);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2880 value = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2881 err = PyDict_SetItem(anns, name, value);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2882 Py_DECREF(value);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2883 if (err != 0) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2884 Py_DECREF(anns);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2885 Py_DECREF(func);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2886 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2887 }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2888 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2889
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2890 if (PyFunction_SetAnnotations(func, anns) != 0) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2891 /* Can't happen unless
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2892 PyFunction_SetAnnotations changes. */
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2893 Py_DECREF(anns);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2894 Py_DECREF(func);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2895 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2896 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2897 Py_DECREF(anns);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2898 Py_DECREF(names);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2899 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2900
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2901 /* XXX Maybe this should be a separate opcode? */
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2902 if (kwdefaults > 0) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2903 PyObject *defs = PyDict_New();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2904 if (defs == NULL) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2905 Py_DECREF(func);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2906 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2907 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2908 while (--kwdefaults >= 0) {
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2909 PyObject *v = POP(); /* default value */
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2910 PyObject *key = POP(); /* kw only arg name */
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2911 int err = PyDict_SetItem(defs, key, v);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2912 Py_DECREF(v);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2913 Py_DECREF(key);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2914 if (err != 0) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2915 Py_DECREF(defs);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2916 Py_DECREF(func);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2917 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2918 }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2919 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2920 if (PyFunction_SetKwDefaults(func, defs) != 0) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2921 /* Can't happen unless
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2922 PyFunction_SetKwDefaults changes. */
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2923 Py_DECREF(func);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2924 Py_DECREF(defs);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2925 goto error;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2926 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2927 Py_DECREF(defs);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2928 }
82133
d296cf1600a8 evaluate positional defaults before keyword-only defaults (closes #16967)
Benjamin Peterson <benjamin@python.org>
parents: 81677
diff changeset
2929 if (posdefaults > 0) {
d296cf1600a8 evaluate positional defaults before keyword-only defaults (closes #16967)
Benjamin Peterson <benjamin@python.org>
parents: 81677
diff changeset
2930 PyObject *defs = PyTuple_New(posdefaults);
d296cf1600a8 evaluate positional defaults before keyword-only defaults (closes #16967)
Benjamin Peterson <benjamin@python.org>
parents: 81677
diff changeset
2931 if (defs == NULL) {
d296cf1600a8 evaluate positional defaults before keyword-only defaults (closes #16967)
Benjamin Peterson <benjamin@python.org>
parents: 81677
diff changeset
2932 Py_DECREF(func);
d296cf1600a8 evaluate positional defaults before keyword-only defaults (closes #16967)
Benjamin Peterson <benjamin@python.org>
parents: 81677
diff changeset
2933 goto error;
d296cf1600a8 evaluate positional defaults before keyword-only defaults (closes #16967)
Benjamin Peterson <benjamin@python.org>
parents: 81677
diff changeset
2934 }
d296cf1600a8 evaluate positional defaults before keyword-only defaults (closes #16967)
Benjamin Peterson <benjamin@python.org>
parents: 81677
diff changeset
2935 while (--posdefaults >= 0)
d296cf1600a8 evaluate positional defaults before keyword-only defaults (closes #16967)
Benjamin Peterson <benjamin@python.org>
parents: 81677
diff changeset
2936 PyTuple_SET_ITEM(defs, posdefaults, POP());
d296cf1600a8 evaluate positional defaults before keyword-only defaults (closes #16967)
Benjamin Peterson <benjamin@python.org>
parents: 81677
diff changeset
2937 if (PyFunction_SetDefaults(func, defs) != 0) {
d296cf1600a8 evaluate positional defaults before keyword-only defaults (closes #16967)
Benjamin Peterson <benjamin@python.org>
parents: 81677
diff changeset
2938 /* Can't happen unless
d296cf1600a8 evaluate positional defaults before keyword-only defaults (closes #16967)
Benjamin Peterson <benjamin@python.org>
parents: 81677
diff changeset
2939 PyFunction_SetDefaults changes. */
d296cf1600a8 evaluate positional defaults before keyword-only defaults (closes #16967)
Benjamin Peterson <benjamin@python.org>
parents: 81677
diff changeset
2940 Py_DECREF(defs);
d296cf1600a8 evaluate positional defaults before keyword-only defaults (closes #16967)
Benjamin Peterson <benjamin@python.org>
parents: 81677
diff changeset
2941 Py_DECREF(func);
d296cf1600a8 evaluate positional defaults before keyword-only defaults (closes #16967)
Benjamin Peterson <benjamin@python.org>
parents: 81677
diff changeset
2942 goto error;
d296cf1600a8 evaluate positional defaults before keyword-only defaults (closes #16967)
Benjamin Peterson <benjamin@python.org>
parents: 81677
diff changeset
2943 }
d296cf1600a8 evaluate positional defaults before keyword-only defaults (closes #16967)
Benjamin Peterson <benjamin@python.org>
parents: 81677
diff changeset
2944 Py_DECREF(defs);
d296cf1600a8 evaluate positional defaults before keyword-only defaults (closes #16967)
Benjamin Peterson <benjamin@python.org>
parents: 81677
diff changeset
2945 }
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2946 PUSH(func);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2947 DISPATCH();
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2948 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2949
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2950 TARGET(BUILD_SLICE) {
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2951 PyObject *start, *stop, *step, *slice;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2952 if (oparg == 3)
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2953 step = POP();
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2954 else
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2955 step = NULL;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2956 stop = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2957 start = TOP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2958 slice = PySlice_New(start, stop, step);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2959 Py_DECREF(start);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2960 Py_DECREF(stop);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2961 Py_XDECREF(step);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2962 SET_TOP(slice);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2963 if (slice == NULL)
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2964 goto error;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2965 DISPATCH();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2966 }
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2967
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2968 TARGET(EXTENDED_ARG) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2969 opcode = NEXTOP();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2970 oparg = oparg<<16 | NEXTARG();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2971 goto dispatch_opcode;
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2972 }
3839
22e29b1747e1 Changes for slice and ellipses
Guido van Rossum <guido@python.org>
parents: 3694
diff changeset
2973
63959
e54baebbd6ff Issue #9203: Computed gotos are now enabled by default on supported
Antoine Pitrou <solipsis@pitrou.net>
parents: 63114
diff changeset
2974 #if USE_COMPUTED_GOTOS
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2975 _unknown_opcode:
51031
d86e23318b41 Issue #4753: By enabling a configure option named '--with-computed-gotos'
Antoine Pitrou <solipsis@pitrou.net>
parents: 50840
diff changeset
2976 #endif
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2977 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2978 fprintf(stderr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2979 "XXX lineno: %d, opcode: %d\n",
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
2980 PyFrame_GetLineNumber(f),
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2981 opcode);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2982 PyErr_SetString(PyExc_SystemError, "unknown opcode");
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2983 goto error;
944
222f04f55083 Changes so that user-defined classes can implement operations invoked
Guido van Rossum <guido@python.org>
parents: 926
diff changeset
2984
222f04f55083 Changes so that user-defined classes can implement operations invoked
Guido van Rossum <guido@python.org>
parents: 926
diff changeset
2985 #ifdef CASE_TOO_BIG
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2986 }
944
222f04f55083 Changes so that user-defined classes can implement operations invoked
Guido van Rossum <guido@python.org>
parents: 926
diff changeset
2987 #endif
222f04f55083 Changes so that user-defined classes can implement operations invoked
Guido van Rossum <guido@python.org>
parents: 926
diff changeset
2988
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2989 } /* switch */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2990
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2991 /* This should never be reached. Every opcode should end with DISPATCH()
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2992 or goto error. */
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2993 assert(0);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2994
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2995 error:
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2996 READ_TIMESTAMP(inst1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
2997
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2998 assert(why == WHY_NOT);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
2999 why = WHY_EXCEPTION;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3000
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3001 /* Double-check exception status. */
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3002 if (!PyErr_Occurred())
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3003 PyErr_SetString(PyExc_SystemError,
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3004 "error return without exception set");
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3005
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3006 /* Log traceback info. */
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3007 PyTraceBack_Here(f);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3008
81677
cd87afe18ff8 revert #16672 for incorrect semantics
Benjamin Peterson <benjamin@python.org>
parents: 81015
diff changeset
3009 if (tstate->c_tracefunc != NULL)
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3010 call_exc_trace(tstate->c_tracefunc, tstate->c_traceobj, f);
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3011
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3012 fast_block_end:
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3013 assert(why != WHY_NOT);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3014
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3015 /* Unwind stacks if a (pseudo) exception occurred */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3016 while (why != WHY_NOT && f->f_iblock > 0) {
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3017 /* Peek at the current block. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3018 PyTryBlock *b = &f->f_blockstack[f->f_iblock - 1];
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3019
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3020 assert(why != WHY_YIELD);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3021 if (b->b_type == SETUP_LOOP && why == WHY_CONTINUE) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3022 why = WHY_NOT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3023 JUMPTO(PyLong_AS_LONG(retval));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3024 Py_DECREF(retval);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3025 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3026 }
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3027 /* Now we have to pop the block. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3028 f->f_iblock--;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3029
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3030 if (b->b_type == EXCEPT_HANDLER) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3031 UNWIND_EXCEPT_HANDLER(b);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3032 continue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3033 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3034 UNWIND_BLOCK(b);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3035 if (b->b_type == SETUP_LOOP && why == WHY_BREAK) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3036 why = WHY_NOT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3037 JUMPTO(b->b_handler);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3038 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3039 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3040 if (why == WHY_EXCEPTION && (b->b_type == SETUP_EXCEPT
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3041 || b->b_type == SETUP_FINALLY)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3042 PyObject *exc, *val, *tb;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3043 int handler = b->b_handler;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3044 /* Beware, this invalidates all b->b_* fields */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3045 PyFrame_BlockSetup(f, EXCEPT_HANDLER, -1, STACK_LEVEL());
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3046 PUSH(tstate->exc_traceback);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3047 PUSH(tstate->exc_value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3048 if (tstate->exc_type != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3049 PUSH(tstate->exc_type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3050 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3051 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3052 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3053 PUSH(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3054 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3055 PyErr_Fetch(&exc, &val, &tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3056 /* Make the raw exception data
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3057 available to the handler,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3058 so a program can emulate the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3059 Python main loop. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3060 PyErr_NormalizeException(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3061 &exc, &val, &tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3062 PyException_SetTraceback(val, tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3063 Py_INCREF(exc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3064 tstate->exc_type = exc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3065 Py_INCREF(val);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3066 tstate->exc_value = val;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3067 tstate->exc_traceback = tb;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3068 if (tb == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3069 tb = Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3070 Py_INCREF(tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3071 PUSH(tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3072 PUSH(val);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3073 PUSH(exc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3074 why = WHY_NOT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3075 JUMPTO(handler);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3076 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3077 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3078 if (b->b_type == SETUP_FINALLY) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3079 if (why & (WHY_RETURN | WHY_CONTINUE))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3080 PUSH(retval);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3081 PUSH(PyLong_FromLong((long)why));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3082 why = WHY_NOT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3083 JUMPTO(b->b_handler);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3084 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3085 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3086 } /* unwind stack */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3087
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3088 /* End the loop if we still have an error (or return) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3089
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3090 if (why != WHY_NOT)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3091 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3092 READ_TIMESTAMP(loop1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3093
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3094 } /* main loop */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3095
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3096 assert(why != WHY_YIELD);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3097 /* Pop remaining stack entries. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3098 while (!EMPTY()) {
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3099 PyObject *o = POP();
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3100 Py_XDECREF(o);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3101 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3102
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3103 if (why != WHY_RETURN)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3104 retval = NULL;
15948
3bc2440427d3 Rich comparisons fall-out:
Guido van Rossum <guido@python.org>
parents: 15899
diff changeset
3105
31462
d5c047807c69 SF patch #864059: optimize eval_frame
Raymond Hettinger <python@rcn.com>
parents: 30979
diff changeset
3106 fast_yield:
71157
419871c62bb3 never retain a generator's caller's exception state on the generator after a yield/return
Benjamin Peterson <benjamin@python.org>
parents: 71151
diff changeset
3107 if (co->co_flags & CO_GENERATOR && (why == WHY_YIELD || why == WHY_RETURN)) {
419871c62bb3 never retain a generator's caller's exception state on the generator after a yield/return
Benjamin Peterson <benjamin@python.org>
parents: 71151
diff changeset
3108 /* The purpose of this block is to put aside the generator's exception
419871c62bb3 never retain a generator's caller's exception state on the generator after a yield/return
Benjamin Peterson <benjamin@python.org>
parents: 71151
diff changeset
3109 state and restore that of the calling frame. If the current
419871c62bb3 never retain a generator's caller's exception state on the generator after a yield/return
Benjamin Peterson <benjamin@python.org>
parents: 71151
diff changeset
3110 exception state is from the caller, we clear the exception values
419871c62bb3 never retain a generator's caller's exception state on the generator after a yield/return
Benjamin Peterson <benjamin@python.org>
parents: 71151
diff changeset
3111 on the generator frame, so they are not swapped back in latter. The
419871c62bb3 never retain a generator's caller's exception state on the generator after a yield/return
Benjamin Peterson <benjamin@python.org>
parents: 71151
diff changeset
3112 origin of the current exception state is determined by checking for
419871c62bb3 never retain a generator's caller's exception state on the generator after a yield/return
Benjamin Peterson <benjamin@python.org>
parents: 71151
diff changeset
3113 except handler blocks, which we must be in iff a new exception
419871c62bb3 never retain a generator's caller's exception state on the generator after a yield/return
Benjamin Peterson <benjamin@python.org>
parents: 71151
diff changeset
3114 state came into existence in this frame. (An uncaught exception
419871c62bb3 never retain a generator's caller's exception state on the generator after a yield/return
Benjamin Peterson <benjamin@python.org>
parents: 71151
diff changeset
3115 would have why == WHY_EXCEPTION, and we wouldn't be here). */
419871c62bb3 never retain a generator's caller's exception state on the generator after a yield/return
Benjamin Peterson <benjamin@python.org>
parents: 71151
diff changeset
3116 int i;
419871c62bb3 never retain a generator's caller's exception state on the generator after a yield/return
Benjamin Peterson <benjamin@python.org>
parents: 71151
diff changeset
3117 for (i = 0; i < f->f_iblock; i++)
419871c62bb3 never retain a generator's caller's exception state on the generator after a yield/return
Benjamin Peterson <benjamin@python.org>
parents: 71151
diff changeset
3118 if (f->f_blockstack[i].b_type == EXCEPT_HANDLER)
419871c62bb3 never retain a generator's caller's exception state on the generator after a yield/return
Benjamin Peterson <benjamin@python.org>
parents: 71151
diff changeset
3119 break;
419871c62bb3 never retain a generator's caller's exception state on the generator after a yield/return
Benjamin Peterson <benjamin@python.org>
parents: 71151
diff changeset
3120 if (i == f->f_iblock)
419871c62bb3 never retain a generator's caller's exception state on the generator after a yield/return
Benjamin Peterson <benjamin@python.org>
parents: 71151
diff changeset
3121 /* We did not create this exception. */
71159
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3122 restore_and_clear_exc_state(tstate, f);
71157
419871c62bb3 never retain a generator's caller's exception state on the generator after a yield/return
Benjamin Peterson <benjamin@python.org>
parents: 71151
diff changeset
3123 else
71159
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3124 swap_exc_state(tstate, f);
71157
419871c62bb3 never retain a generator's caller's exception state on the generator after a yield/return
Benjamin Peterson <benjamin@python.org>
parents: 71151
diff changeset
3125 }
71151
cc7ae81cfe91 restore a generator's caller's exception state both on yield and (last) return
Benjamin Peterson <benjamin@python.org>
parents: 69832
diff changeset
3126
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3127 if (tstate->use_tracing) {
81677
cd87afe18ff8 revert #16672 for incorrect semantics
Benjamin Peterson <benjamin@python.org>
parents: 81015
diff changeset
3128 if (tstate->c_tracefunc) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3129 if (why == WHY_RETURN || why == WHY_YIELD) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3130 if (call_trace(tstate->c_tracefunc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3131 tstate->c_traceobj, f,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3132 PyTrace_RETURN, retval)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3133 Py_XDECREF(retval);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3134 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3135 why = WHY_EXCEPTION;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3136 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3137 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3138 else if (why == WHY_EXCEPTION) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3139 call_trace_protected(tstate->c_tracefunc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3140 tstate->c_traceobj, f,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3141 PyTrace_RETURN, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3142 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3143 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3144 if (tstate->c_profilefunc) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3145 if (why == WHY_EXCEPTION)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3146 call_trace_protected(tstate->c_profilefunc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3147 tstate->c_profileobj, f,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3148 PyTrace_RETURN, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3149 else if (call_trace(tstate->c_profilefunc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3150 tstate->c_profileobj, f,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3151 PyTrace_RETURN, retval)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3152 Py_XDECREF(retval);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3153 retval = NULL;
68102
e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254.
Brett Cannon <bcannon@gmail.com>
parents: 68086
diff changeset
3154 /* why = WHY_EXCEPTION; */
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3155 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3156 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3157 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3158
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3159 /* pop frame */
43410
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from
Thomas Wouters <thomas@python.org>
parents: 43188
diff changeset
3160 exit_eval_frame:
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3161 Py_LeaveRecursiveCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3162 tstate->frame = f->f_back;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3163
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3164 return retval;
173
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
3165 }
4656452436e1 Moved support functions after main function; added prototypes;
Guido van Rossum <guido@python.org>
parents: 159
diff changeset
3166
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3167 static void
70940
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3168 format_missing(const char *kind, PyCodeObject *co, PyObject *names)
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3169 {
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3170 int err;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3171 Py_ssize_t len = PyList_GET_SIZE(names);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3172 PyObject *name_str, *comma, *tail, *tmp;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3173
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3174 assert(PyList_CheckExact(names));
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3175 assert(len >= 1);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3176 /* Deal with the joys of natural language. */
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3177 switch (len) {
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3178 case 1:
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3179 name_str = PyList_GET_ITEM(names, 0);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3180 Py_INCREF(name_str);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3181 break;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3182 case 2:
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3183 name_str = PyUnicode_FromFormat("%U and %U",
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3184 PyList_GET_ITEM(names, len - 2),
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3185 PyList_GET_ITEM(names, len - 1));
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3186 break;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3187 default:
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3188 tail = PyUnicode_FromFormat(", %U, and %U",
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3189 PyList_GET_ITEM(names, len - 2),
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3190 PyList_GET_ITEM(names, len - 1));
77283
2285a82504dc check return for error
Benjamin Peterson <benjamin@python.org>
parents: 76942
diff changeset
3191 if (tail == NULL)
2285a82504dc check return for error
Benjamin Peterson <benjamin@python.org>
parents: 76942
diff changeset
3192 return;
70940
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3193 /* Chop off the last two objects in the list. This shouldn't actually
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3194 fail, but we can't be too careful. */
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3195 err = PyList_SetSlice(names, len - 2, len, NULL);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3196 if (err == -1) {
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3197 Py_DECREF(tail);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3198 return;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3199 }
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3200 /* Stitch everything up into a nice comma-separated list. */
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3201 comma = PyUnicode_FromString(", ");
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3202 if (comma == NULL) {
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3203 Py_DECREF(tail);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3204 return;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3205 }
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3206 tmp = PyUnicode_Join(comma, names);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3207 Py_DECREF(comma);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3208 if (tmp == NULL) {
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3209 Py_DECREF(tail);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3210 return;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3211 }
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3212 name_str = PyUnicode_Concat(tmp, tail);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3213 Py_DECREF(tmp);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3214 Py_DECREF(tail);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3215 break;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3216 }
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3217 if (name_str == NULL)
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3218 return;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3219 PyErr_Format(PyExc_TypeError,
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3220 "%U() missing %i required %s argument%s: %U",
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3221 co->co_name,
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3222 len,
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3223 kind,
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3224 len == 1 ? "" : "s",
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3225 name_str);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3226 Py_DECREF(name_str);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3227 }
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3228
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3229 static void
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3230 missing_arguments(PyCodeObject *co, int missing, int defcount,
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3231 PyObject **fastlocals)
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3232 {
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3233 int i, j = 0;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3234 int start, end;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3235 int positional = defcount != -1;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3236 const char *kind = positional ? "positional" : "keyword-only";
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3237 PyObject *missing_names;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3238
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3239 /* Compute the names of the arguments that are missing. */
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3240 missing_names = PyList_New(missing);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3241 if (missing_names == NULL)
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3242 return;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3243 if (positional) {
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3244 start = 0;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3245 end = co->co_argcount - defcount;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3246 }
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3247 else {
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3248 start = co->co_argcount;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3249 end = start + co->co_kwonlyargcount;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3250 }
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3251 for (i = start; i < end; i++) {
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3252 if (GETLOCAL(i) == NULL) {
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3253 PyObject *raw = PyTuple_GET_ITEM(co->co_varnames, i);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3254 PyObject *name = PyObject_Repr(raw);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3255 if (name == NULL) {
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3256 Py_DECREF(missing_names);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3257 return;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3258 }
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3259 PyList_SET_ITEM(missing_names, j++, name);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3260 }
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3261 }
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3262 assert(j == missing);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3263 format_missing(kind, co, missing_names);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3264 Py_DECREF(missing_names);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3265 }
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3266
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3267 static void
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3268 too_many_positional(PyCodeObject *co, int given, int defcount, PyObject **fastlocals)
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3269 {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3270 int plural;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3271 int kwonly_given = 0;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3272 int i;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3273 PyObject *sig, *kwonly_sig;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3274
70940
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3275 assert((co->co_flags & CO_VARARGS) == 0);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3276 /* Count missing keyword-only args. */
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3277 for (i = co->co_argcount; i < co->co_argcount + co->co_kwonlyargcount; i++)
70940
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3278 if (GETLOCAL(i) != NULL)
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3279 kwonly_given++;
70940
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3280 if (defcount) {
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3281 int atleast = co->co_argcount - defcount;
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3282 plural = 1;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3283 sig = PyUnicode_FromFormat("from %d to %d", atleast, co->co_argcount);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3284 }
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3285 else {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3286 plural = co->co_argcount != 1;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3287 sig = PyUnicode_FromFormat("%d", co->co_argcount);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3288 }
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3289 if (sig == NULL)
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3290 return;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3291 if (kwonly_given) {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3292 const char *format = " positional argument%s (and %d keyword-only argument%s)";
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3293 kwonly_sig = PyUnicode_FromFormat(format, given != 1 ? "s" : "", kwonly_given,
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3294 kwonly_given != 1 ? "s" : "");
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3295 if (kwonly_sig == NULL) {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3296 Py_DECREF(sig);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3297 return;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3298 }
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3299 }
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3300 else {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3301 /* This will not fail. */
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3302 kwonly_sig = PyUnicode_FromString("");
70940
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3303 assert(kwonly_sig != NULL);
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3304 }
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3305 PyErr_Format(PyExc_TypeError,
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3306 "%U() takes %U positional argument%s but %d%U %s given",
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3307 co->co_name,
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3308 sig,
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3309 plural ? "s" : "",
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3310 given,
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3311 kwonly_sig,
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3312 given == 1 && !kwonly_given ? "was" : "were");
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3313 Py_DECREF(sig);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3314 Py_DECREF(kwonly_sig);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3315 }
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3316
36695
b6d2f6fd3e11 PEP 343 -- the with-statement.
Guido van Rossum <guido@python.org>
parents: 36580
diff changeset
3317 /* This is gonna seem *real weird*, but if you put some other code between
32421
485d2ef43419 Patch #966493: Cleanup generator/eval_frame exposure.
Martin v. Löwis <martin@v.loewis.de>
parents: 32412
diff changeset
3318 PyEval_EvalFrame() and PyEval_EvalCodeEx() you will need to adjust
36695
b6d2f6fd3e11 PEP 343 -- the with-statement.
Guido van Rossum <guido@python.org>
parents: 36580
diff changeset
3319 the test in the if statements in Misc/gdbinit (pystack and pystackv). */
31606
fd2103ae6f29 Add pystack definition to Misc/gdbinit with some explanation of its behavior
Skip Montanaro <skip@pobox.com>
parents: 31514
diff changeset
3320
18933
09df3254b49d Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents: 18611
diff changeset
3321 PyObject *
66664
62b61abd02b8 Merge branches/pep-0384.
Martin v. Löwis <martin@v.loewis.de>
parents: 66556
diff changeset
3322 PyEval_EvalCodeEx(PyObject *_co, PyObject *globals, PyObject *locals,
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3323 PyObject **args, int argcount, PyObject **kws, int kwcount,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3324 PyObject **defs, int defcount, PyObject *kwdefs, PyObject *closure)
18148
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay!
Tim Peters <tim.peters@gmail.com>
parents: 18136
diff changeset
3325 {
66664
62b61abd02b8 Merge branches/pep-0384.
Martin v. Löwis <martin@v.loewis.de>
parents: 66556
diff changeset
3326 PyCodeObject* co = (PyCodeObject*)_co;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3327 register PyFrameObject *f;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3328 register PyObject *retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3329 register PyObject **fastlocals, **freevars;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3330 PyThreadState *tstate = PyThreadState_GET();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3331 PyObject *x, *u;
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3332 int total_args = co->co_argcount + co->co_kwonlyargcount;
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3333 int i;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3334 int n = argcount;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3335 PyObject *kwdict = NULL;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3336
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3337 if (globals == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3338 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3339 "PyEval_EvalCodeEx: NULL globals");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3340 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3341 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3342
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3343 assert(tstate != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3344 assert(globals != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3345 f = PyFrame_New(tstate, co, globals, locals);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3346 if (f == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3347 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3348
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3349 fastlocals = f->f_localsplus;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3350 freevars = f->f_localsplus + co->co_nlocals;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3351
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3352 /* Parse arguments. */
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3353 if (co->co_flags & CO_VARKEYWORDS) {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3354 kwdict = PyDict_New();
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3355 if (kwdict == NULL)
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3356 goto fail;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3357 i = total_args;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3358 if (co->co_flags & CO_VARARGS)
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3359 i++;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3360 SETLOCAL(i, kwdict);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3361 }
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3362 if (argcount > co->co_argcount)
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3363 n = co->co_argcount;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3364 for (i = 0; i < n; i++) {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3365 x = args[i];
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3366 Py_INCREF(x);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3367 SETLOCAL(i, x);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3368 }
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3369 if (co->co_flags & CO_VARARGS) {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3370 u = PyTuple_New(argcount - n);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3371 if (u == NULL)
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3372 goto fail;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3373 SETLOCAL(total_args, u);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3374 for (i = n; i < argcount; i++) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3375 x = args[i];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3376 Py_INCREF(x);
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3377 PyTuple_SET_ITEM(u, i-n, x);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3378 }
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3379 }
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3380 for (i = 0; i < kwcount; i++) {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3381 PyObject **co_varnames;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3382 PyObject *keyword = kws[2*i];
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3383 PyObject *value = kws[2*i + 1];
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3384 int j;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3385 if (keyword == NULL || !PyUnicode_Check(keyword)) {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3386 PyErr_Format(PyExc_TypeError,
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3387 "%U() keywords must be strings",
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3388 co->co_name);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3389 goto fail;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3390 }
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3391 /* Speed hack: do raw pointer compares. As names are
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3392 normally interned this should almost always hit. */
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3393 co_varnames = ((PyTupleObject *)(co->co_varnames))->ob_item;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3394 for (j = 0; j < total_args; j++) {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3395 PyObject *nm = co_varnames[j];
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3396 if (nm == keyword)
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3397 goto kw_found;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3398 }
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3399 /* Slow fallback, just in case */
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3400 for (j = 0; j < total_args; j++) {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3401 PyObject *nm = co_varnames[j];
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3402 int cmp = PyObject_RichCompareBool(
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3403 keyword, nm, Py_EQ);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3404 if (cmp > 0)
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3405 goto kw_found;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3406 else if (cmp < 0)
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3407 goto fail;
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3408 }
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3409 if (j >= total_args && kwdict == NULL) {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3410 PyErr_Format(PyExc_TypeError,
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3411 "%U() got an unexpected "
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3412 "keyword argument '%S'",
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3413 co->co_name,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3414 keyword);
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3415 goto fail;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3416 }
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3417 PyDict_SetItem(kwdict, keyword, value);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3418 continue;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3419 kw_found:
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3420 if (GETLOCAL(j) != NULL) {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3421 PyErr_Format(PyExc_TypeError,
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3422 "%U() got multiple "
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3423 "values for argument '%S'",
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3424 co->co_name,
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3425 keyword);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3426 goto fail;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3427 }
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3428 Py_INCREF(value);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3429 SETLOCAL(j, value);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3430 }
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3431 if (argcount > co->co_argcount && !(co->co_flags & CO_VARARGS)) {
70940
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3432 too_many_positional(co, argcount, defcount, fastlocals);
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3433 goto fail;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3434 }
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3435 if (argcount < co->co_argcount) {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3436 int m = co->co_argcount - defcount;
70940
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3437 int missing = 0;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3438 for (i = argcount; i < m; i++)
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3439 if (GETLOCAL(i) == NULL)
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3440 missing++;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3441 if (missing) {
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3442 missing_arguments(co, missing, defcount, fastlocals);
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3443 goto fail;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3444 }
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3445 if (n > m)
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3446 i = n - m;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3447 else
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3448 i = 0;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3449 for (; i < defcount; i++) {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3450 if (GETLOCAL(m+i) == NULL) {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3451 PyObject *def = defs[i];
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3452 Py_INCREF(def);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3453 SETLOCAL(m+i, def);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3454 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3455 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3456 }
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3457 if (co->co_kwonlyargcount > 0) {
70940
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3458 int missing = 0;
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3459 for (i = co->co_argcount; i < total_args; i++) {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3460 PyObject *name;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3461 if (GETLOCAL(i) != NULL)
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3462 continue;
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3463 name = PyTuple_GET_ITEM(co->co_varnames, i);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3464 if (kwdefs != NULL) {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3465 PyObject *def = PyDict_GetItem(kwdefs, name);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3466 if (def) {
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3467 Py_INCREF(def);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3468 SETLOCAL(i, def);
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3469 continue;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3470 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3471 }
70940
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3472 missing++;
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3473 }
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3474 if (missing) {
52744a5a9260 give the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson <benjamin@python.org>
parents: 70652
diff changeset
3475 missing_arguments(co, missing, -1, fastlocals);
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3476 goto fail;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3477 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3478 }
70652
44d46d74ef4f greatly improve argument parsing error messages (closes #12265)
Benjamin Peterson <benjamin@python.org>
parents: 69833
diff changeset
3479
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3480 /* Allocate and initialize storage for cell vars, and copy free
70987
c5b0585624ef map cells to arg slots at code creation time (closes #12399)
Benjamin Peterson <benjamin@python.org>
parents: 70940
diff changeset
3481 vars into frame. */
c5b0585624ef map cells to arg slots at code creation time (closes #12399)
Benjamin Peterson <benjamin@python.org>
parents: 70940
diff changeset
3482 for (i = 0; i < PyTuple_GET_SIZE(co->co_cellvars); ++i) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3483 PyObject *c;
70987
c5b0585624ef map cells to arg slots at code creation time (closes #12399)
Benjamin Peterson <benjamin@python.org>
parents: 70940
diff changeset
3484 int arg;
c5b0585624ef map cells to arg slots at code creation time (closes #12399)
Benjamin Peterson <benjamin@python.org>
parents: 70940
diff changeset
3485 /* Possibly account for the cell variable being an argument. */
c5b0585624ef map cells to arg slots at code creation time (closes #12399)
Benjamin Peterson <benjamin@python.org>
parents: 70940
diff changeset
3486 if (co->co_cell2arg != NULL &&
c5b0585624ef map cells to arg slots at code creation time (closes #12399)
Benjamin Peterson <benjamin@python.org>
parents: 70940
diff changeset
3487 (arg = co->co_cell2arg[i]) != CO_CELL_NOT_AN_ARG)
c5b0585624ef map cells to arg slots at code creation time (closes #12399)
Benjamin Peterson <benjamin@python.org>
parents: 70940
diff changeset
3488 c = PyCell_New(GETLOCAL(arg));
c5b0585624ef map cells to arg slots at code creation time (closes #12399)
Benjamin Peterson <benjamin@python.org>
parents: 70940
diff changeset
3489 else
c5b0585624ef map cells to arg slots at code creation time (closes #12399)
Benjamin Peterson <benjamin@python.org>
parents: 70940
diff changeset
3490 c = PyCell_New(NULL);
c5b0585624ef map cells to arg slots at code creation time (closes #12399)
Benjamin Peterson <benjamin@python.org>
parents: 70940
diff changeset
3491 if (c == NULL)
c5b0585624ef map cells to arg slots at code creation time (closes #12399)
Benjamin Peterson <benjamin@python.org>
parents: 70940
diff changeset
3492 goto fail;
c5b0585624ef map cells to arg slots at code creation time (closes #12399)
Benjamin Peterson <benjamin@python.org>
parents: 70940
diff changeset
3493 SETLOCAL(co->co_nlocals + i, c);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3494 }
70987
c5b0585624ef map cells to arg slots at code creation time (closes #12399)
Benjamin Peterson <benjamin@python.org>
parents: 70940
diff changeset
3495 for (i = 0; i < PyTuple_GET_SIZE(co->co_freevars); ++i) {
c5b0585624ef map cells to arg slots at code creation time (closes #12399)
Benjamin Peterson <benjamin@python.org>
parents: 70940
diff changeset
3496 PyObject *o = PyTuple_GET_ITEM(closure, i);
c5b0585624ef map cells to arg slots at code creation time (closes #12399)
Benjamin Peterson <benjamin@python.org>
parents: 70940
diff changeset
3497 Py_INCREF(o);
c5b0585624ef map cells to arg slots at code creation time (closes #12399)
Benjamin Peterson <benjamin@python.org>
parents: 70940
diff changeset
3498 freevars[PyTuple_GET_SIZE(co->co_cellvars) + i] = o;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3499 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3500
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3501 if (co->co_flags & CO_GENERATOR) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3502 /* Don't need to keep the reference to f_back, it will be set
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3503 * when the generator is resumed. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3504 Py_XDECREF(f->f_back);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3505 f->f_back = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3506
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3507 PCALL(PCALL_GENERATOR);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3508
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3509 /* Create a new generator that owns the ready to run frame
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3510 * and return that as the value. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3511 return PyGen_New(f);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3512 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3513
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3514 retval = PyEval_EvalFrameEx(f,0);
43410
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from
Thomas Wouters <thomas@python.org>
parents: 43188
diff changeset
3515
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from
Thomas Wouters <thomas@python.org>
parents: 43188
diff changeset
3516 fail: /* Jump here from prelude on failure */
18148
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay!
Tim Peters <tim.peters@gmail.com>
parents: 18136
diff changeset
3517
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3518 /* decref'ing the frame can cause __del__ methods to get invoked,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3519 which can call back into Python. While we're done with the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3520 current Python frame (f), the associated C stack is still in use,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3521 so recursion_depth must be boosted for the duration.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3522 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3523 assert(tstate != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3524 ++tstate->recursion_depth;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3525 Py_DECREF(f);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3526 --tstate->recursion_depth;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3527 return retval;
18148
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay!
Tim Peters <tim.peters@gmail.com>
parents: 18136
diff changeset
3528 }
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay!
Tim Peters <tim.peters@gmail.com>
parents: 18136
diff changeset
3529
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay!
Tim Peters <tim.peters@gmail.com>
parents: 18136
diff changeset
3530
54889
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 54459
diff changeset
3531 static PyObject *
74578
7d96679c5d46 use the static identifier api for looking up special methods
Benjamin Peterson <benjamin@python.org>
parents: 74367
diff changeset
3532 special_lookup(PyObject *o, _Py_Identifier *id)
54889
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 54459
diff changeset
3533 {
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3534 PyObject *res;
74578
7d96679c5d46 use the static identifier api for looking up special methods
Benjamin Peterson <benjamin@python.org>
parents: 74367
diff changeset
3535 res = _PyObject_LookupSpecial(o, id);
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3536 if (res == NULL && !PyErr_Occurred()) {
74578
7d96679c5d46 use the static identifier api for looking up special methods
Benjamin Peterson <benjamin@python.org>
parents: 74367
diff changeset
3537 PyErr_SetObject(PyExc_AttributeError, id->object);
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3538 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3539 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3540 return res;
54889
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 54459
diff changeset
3541 }
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 54459
diff changeset
3542
3aaf2e065db0 Merged revisions 72912,72920,72940 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 54459
diff changeset
3543
71159
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3544 /* These 3 functions deal with the exception state of generators. */
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3545
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3546 static void
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3547 save_exc_state(PyThreadState *tstate, PyFrameObject *f)
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3548 {
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3549 PyObject *type, *value, *traceback;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3550 Py_XINCREF(tstate->exc_type);
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3551 Py_XINCREF(tstate->exc_value);
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3552 Py_XINCREF(tstate->exc_traceback);
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3553 type = f->f_exc_type;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3554 value = f->f_exc_value;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3555 traceback = f->f_exc_traceback;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3556 f->f_exc_type = tstate->exc_type;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3557 f->f_exc_value = tstate->exc_value;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3558 f->f_exc_traceback = tstate->exc_traceback;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3559 Py_XDECREF(type);
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3560 Py_XDECREF(value);
72605
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
3561 Py_XDECREF(traceback);
71159
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3562 }
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3563
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3564 static void
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3565 swap_exc_state(PyThreadState *tstate, PyFrameObject *f)
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3566 {
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3567 PyObject *tmp;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3568 tmp = tstate->exc_type;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3569 tstate->exc_type = f->f_exc_type;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3570 f->f_exc_type = tmp;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3571 tmp = tstate->exc_value;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3572 tstate->exc_value = f->f_exc_value;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3573 f->f_exc_value = tmp;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3574 tmp = tstate->exc_traceback;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3575 tstate->exc_traceback = f->f_exc_traceback;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3576 f->f_exc_traceback = tmp;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3577 }
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3578
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3579 static void
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3580 restore_and_clear_exc_state(PyThreadState *tstate, PyFrameObject *f)
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3581 {
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3582 PyObject *type, *value, *tb;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3583 type = tstate->exc_type;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3584 value = tstate->exc_value;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3585 tb = tstate->exc_traceback;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3586 tstate->exc_type = f->f_exc_type;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3587 tstate->exc_value = f->f_exc_value;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3588 tstate->exc_traceback = f->f_exc_traceback;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3589 f->f_exc_type = NULL;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3590 f->f_exc_value = NULL;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3591 f->f_exc_traceback = NULL;
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3592 Py_XDECREF(type);
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3593 Py_XDECREF(value);
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3594 Py_XDECREF(tb);
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3595 }
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3596
95784a617d05 convert generator exc state functions into static functions
Benjamin Peterson <benjamin@python.org>
parents: 71158
diff changeset
3597
4667
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function.
Guido van Rossum <guido@python.org>
parents: 4594
diff changeset
3598 /* Logic for the raise statement (too complicated for inlining).
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function.
Guido van Rossum <guido@python.org>
parents: 4594
diff changeset
3599 This *consumes* a reference count to each of its arguments. */
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3600 static int
43102
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134.
Collin Winter <collinw@gmail.com>
parents: 43100
diff changeset
3601 do_raise(PyObject *exc, PyObject *cause)
4667
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function.
Guido van Rossum <guido@python.org>
parents: 4594
diff changeset
3602 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3603 PyObject *type = NULL, *value = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3604
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3605 if (exc == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3606 /* Reraise */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3607 PyThreadState *tstate = PyThreadState_GET();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3608 PyObject *tb;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3609 type = tstate->exc_type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3610 value = tstate->exc_value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3611 tb = tstate->exc_traceback;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3612 if (type == Py_None) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3613 PyErr_SetString(PyExc_RuntimeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3614 "No active exception to reraise");
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3615 return 0;
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3616 }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3617 Py_XINCREF(type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3618 Py_XINCREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3619 Py_XINCREF(tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3620 PyErr_Restore(type, value, tb);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3621 return 1;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3622 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3623
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3624 /* We support the following forms of raise:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3625 raise
43102
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134.
Collin Winter <collinw@gmail.com>
parents: 43100
diff changeset
3626 raise <instance>
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134.
Collin Winter <collinw@gmail.com>
parents: 43100
diff changeset
3627 raise <type> */
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134.
Collin Winter <collinw@gmail.com>
parents: 43100
diff changeset
3628
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3629 if (PyExceptionClass_Check(exc)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3630 type = exc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3631 value = PyObject_CallObject(exc, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3632 if (value == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3633 goto raise_error;
71349
8d05f697acd4 catch nasty exception classes with __new__ that doesn't return a exception (closes #11627)
Benjamin Peterson <benjamin@python.org>
parents: 71157
diff changeset
3634 if (!PyExceptionInstance_Check(value)) {
8d05f697acd4 catch nasty exception classes with __new__ that doesn't return a exception (closes #11627)
Benjamin Peterson <benjamin@python.org>
parents: 71157
diff changeset
3635 PyErr_Format(PyExc_TypeError,
8d05f697acd4 catch nasty exception classes with __new__ that doesn't return a exception (closes #11627)
Benjamin Peterson <benjamin@python.org>
parents: 71157
diff changeset
3636 "calling %R should have returned an instance of "
8d05f697acd4 catch nasty exception classes with __new__ that doesn't return a exception (closes #11627)
Benjamin Peterson <benjamin@python.org>
parents: 71157
diff changeset
3637 "BaseException, not %R",
8d05f697acd4 catch nasty exception classes with __new__ that doesn't return a exception (closes #11627)
Benjamin Peterson <benjamin@python.org>
parents: 71157
diff changeset
3638 type, Py_TYPE(value));
8d05f697acd4 catch nasty exception classes with __new__ that doesn't return a exception (closes #11627)
Benjamin Peterson <benjamin@python.org>
parents: 71157
diff changeset
3639 goto raise_error;
8d05f697acd4 catch nasty exception classes with __new__ that doesn't return a exception (closes #11627)
Benjamin Peterson <benjamin@python.org>
parents: 71157
diff changeset
3640 }
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3641 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3642 else if (PyExceptionInstance_Check(exc)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3643 value = exc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3644 type = PyExceptionInstance_Class(exc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3645 Py_INCREF(type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3646 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3647 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3648 /* Not something you can raise. You get an exception
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3649 anyway, just not what you specified :-) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3650 Py_DECREF(exc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3651 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3652 "exceptions must derive from BaseException");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3653 goto raise_error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3654 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3655
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3656 if (cause) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3657 PyObject *fixed_cause;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3658 if (PyExceptionClass_Check(cause)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3659 fixed_cause = PyObject_CallObject(cause, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3660 if (fixed_cause == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3661 goto raise_error;
76942
b0eb7d2a9542 PEP 415: Implement suppression of __context__ display with an exception attribute
Benjamin Peterson <benjamin@python.org>
parents: 76567
diff changeset
3662 Py_DECREF(cause);
b0eb7d2a9542 PEP 415: Implement suppression of __context__ display with an exception attribute
Benjamin Peterson <benjamin@python.org>
parents: 76567
diff changeset
3663 }
b0eb7d2a9542 PEP 415: Implement suppression of __context__ display with an exception attribute
Benjamin Peterson <benjamin@python.org>
parents: 76567
diff changeset
3664 else if (PyExceptionInstance_Check(cause)) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3665 fixed_cause = cause;
76942
b0eb7d2a9542 PEP 415: Implement suppression of __context__ display with an exception attribute
Benjamin Peterson <benjamin@python.org>
parents: 76567
diff changeset
3666 }
b0eb7d2a9542 PEP 415: Implement suppression of __context__ display with an exception attribute
Benjamin Peterson <benjamin@python.org>
parents: 76567
diff changeset
3667 else if (cause == Py_None) {
b0eb7d2a9542 PEP 415: Implement suppression of __context__ display with an exception attribute
Benjamin Peterson <benjamin@python.org>
parents: 76567
diff changeset
3668 Py_DECREF(cause);
b0eb7d2a9542 PEP 415: Implement suppression of __context__ display with an exception attribute
Benjamin Peterson <benjamin@python.org>
parents: 76567
diff changeset
3669 fixed_cause = NULL;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3670 }
76942
b0eb7d2a9542 PEP 415: Implement suppression of __context__ display with an exception attribute
Benjamin Peterson <benjamin@python.org>
parents: 76567
diff changeset
3671 else {
b0eb7d2a9542 PEP 415: Implement suppression of __context__ display with an exception attribute
Benjamin Peterson <benjamin@python.org>
parents: 76567
diff changeset
3672 PyErr_SetString(PyExc_TypeError,
b0eb7d2a9542 PEP 415: Implement suppression of __context__ display with an exception attribute
Benjamin Peterson <benjamin@python.org>
parents: 76567
diff changeset
3673 "exception causes must derive from "
b0eb7d2a9542 PEP 415: Implement suppression of __context__ display with an exception attribute
Benjamin Peterson <benjamin@python.org>
parents: 76567
diff changeset
3674 "BaseException");
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3675 goto raise_error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3676 }
76942
b0eb7d2a9542 PEP 415: Implement suppression of __context__ display with an exception attribute
Benjamin Peterson <benjamin@python.org>
parents: 76567
diff changeset
3677 PyException_SetCause(value, fixed_cause);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3678 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3679
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3680 PyErr_SetObject(type, value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3681 /* PyErr_SetObject incref's its arguments */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3682 Py_XDECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3683 Py_XDECREF(type);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3684 return 0;
43102
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134.
Collin Winter <collinw@gmail.com>
parents: 43100
diff changeset
3685
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134.
Collin Winter <collinw@gmail.com>
parents: 43100
diff changeset
3686 raise_error:
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3687 Py_XDECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3688 Py_XDECREF(type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3689 Py_XDECREF(cause);
79693
ac30a1b1cf17 ceval cleanup
Benjamin Peterson <benjamin@python.org>
parents: 79650
diff changeset
3690 return 0;
4667
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function.
Guido van Rossum <guido@python.org>
parents: 4594
diff changeset
3691 }
c42379e4653b Moved the raise logic out of the main interpreter loop to a separate function.
Guido van Rossum <guido@python.org>
parents: 4594
diff changeset
3692
18195
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into
Tim Peters <tim.peters@gmail.com>
parents: 18194
diff changeset
3693 /* Iterate v argcnt times and store the results on the stack (via decreasing
41699
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from
Guido van Rossum <guido@python.org>
parents: 41558
diff changeset
3694 sp). Return 1 for success, 0 if error.
48574
d3d586019aff Merged revisions 65240-65242 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 48516
diff changeset
3695
41699
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from
Guido van Rossum <guido@python.org>
parents: 41558
diff changeset
3696 If argcntafter == -1, do a simple unpack. If it is >= 0, do an unpack
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from
Guido van Rossum <guido@python.org>
parents: 41558
diff changeset
3697 with a variable target.
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from
Guido van Rossum <guido@python.org>
parents: 41558
diff changeset
3698 */
18195
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into
Tim Peters <tim.peters@gmail.com>
parents: 18194
diff changeset
3699
6157
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and
Barry Warsaw <barry@python.org>
parents: 6147
diff changeset
3700 static int
41699
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from
Guido van Rossum <guido@python.org>
parents: 41558
diff changeset
3701 unpack_iterable(PyObject *v, int argcnt, int argcntafter, PyObject **sp)
6157
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and
Barry Warsaw <barry@python.org>
parents: 6147
diff changeset
3702 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3703 int i = 0, j = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3704 Py_ssize_t ll = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3705 PyObject *it; /* iter(v) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3706 PyObject *w;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3707 PyObject *l = NULL; /* variable list */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3708
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3709 assert(v != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3710
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3711 it = PyObject_GetIter(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3712 if (it == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3713 goto Error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3714
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3715 for (; i < argcnt; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3716 w = PyIter_Next(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3717 if (w == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3718 /* Iterator done, via error or exhaustion. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3719 if (!PyErr_Occurred()) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3720 PyErr_Format(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3721 "need more than %d value%s to unpack",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3722 i, i == 1 ? "" : "s");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3723 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3724 goto Error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3725 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3726 *--sp = w;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3727 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3728
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3729 if (argcntafter == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3730 /* We better have exhausted the iterator now. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3731 w = PyIter_Next(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3732 if (w == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3733 if (PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3734 goto Error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3735 Py_DECREF(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3736 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3737 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3738 Py_DECREF(w);
62914
983e2c0bf8dc #3071: tell how many values were expected when unpacking too many.
Georg Brandl <georg@python.org>
parents: 62492
diff changeset
3739 PyErr_Format(PyExc_ValueError, "too many values to unpack "
983e2c0bf8dc #3071: tell how many values were expected when unpacking too many.
Georg Brandl <georg@python.org>
parents: 62492
diff changeset
3740 "(expected %d)", argcnt);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3741 goto Error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3742 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3743
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3744 l = PySequence_List(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3745 if (l == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3746 goto Error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3747 *--sp = l;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3748 i++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3749
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3750 ll = PyList_GET_SIZE(l);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3751 if (ll < argcntafter) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3752 PyErr_Format(PyExc_ValueError, "need more than %zd values to unpack",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3753 argcnt + ll);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3754 goto Error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3755 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3756
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3757 /* Pop the "after-variable" args off the list. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3758 for (j = argcntafter; j > 0; j--, i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3759 *--sp = PyList_GET_ITEM(l, ll - j);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3760 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3761 /* Resize the list. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3762 Py_SIZE(l) = ll - argcntafter;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3763 Py_DECREF(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3764 return 1;
41699
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from
Guido van Rossum <guido@python.org>
parents: 41558
diff changeset
3765
18195
36e825660a24 Teach the UNPACK_SEQUENCE opcode how to tease an iterable object into
Tim Peters <tim.peters@gmail.com>
parents: 18194
diff changeset
3766 Error:
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3767 for (; i > 0; i--, sp++)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3768 Py_DECREF(*sp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3769 Py_XDECREF(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3770 return 0;
6157
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and
Barry Warsaw <barry@python.org>
parents: 6147
diff changeset
3771 }
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and
Barry Warsaw <barry@python.org>
parents: 6147
diff changeset
3772
647e60fb3bac eval_code2(): collapsed the implementations of UNPACK_TUPLE and
Barry Warsaw <barry@python.org>
parents: 6147
diff changeset
3773
567
8c179d023583 User trace feature.
Guido van Rossum <guido@python.org>
parents: 565
diff changeset
3774 #ifdef LLTRACE
86
a6934380c6e7 "Compiling" version
Guido van Rossum <guido@python.org>
parents: 72
diff changeset
3775 static int
13658
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents: 13620
diff changeset
3776 prtrace(PyObject *v, char *str)
69
cccd534f2280 Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
3777 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3778 printf("%s ", str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3779 if (PyObject_Print(v, stdout, 0) != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3780 PyErr_Clear(); /* Don't know what else to do */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3781 printf("\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3782 return 1;
69
cccd534f2280 Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
3783 }
86
a6934380c6e7 "Compiling" version
Guido van Rossum <guido@python.org>
parents: 72
diff changeset
3784 #endif
69
cccd534f2280 Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
3785
708
8bcb50f436fa New trace implementation; and profile (in a similat vein).
Guido van Rossum <guido@python.org>
parents: 688
diff changeset
3786 static void
18326
e427afb5637f Revise the interface to the profiling and tracing support for the
Fred Drake <fdrake@acm.org>
parents: 18293
diff changeset
3787 call_exc_trace(Py_tracefunc func, PyObject *self, PyFrameObject *f)
708
8bcb50f436fa New trace implementation; and profile (in a similat vein).
Guido van Rossum <guido@python.org>
parents: 688
diff changeset
3788 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3789 PyObject *type, *value, *traceback, *arg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3790 int err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3791 PyErr_Fetch(&type, &value, &traceback);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3792 if (value == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3793 value = Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3794 Py_INCREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3795 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3796 arg = PyTuple_Pack(3, type, value, traceback);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3797 if (arg == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3798 PyErr_Restore(type, value, traceback);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3799 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3800 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3801 err = call_trace(func, self, f, PyTrace_EXCEPTION, arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3802 Py_DECREF(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3803 if (err == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3804 PyErr_Restore(type, value, traceback);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3805 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3806 Py_XDECREF(type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3807 Py_XDECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3808 Py_XDECREF(traceback);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3809 }
708
8bcb50f436fa New trace implementation; and profile (in a similat vein).
Guido van Rossum <guido@python.org>
parents: 688
diff changeset
3810 }
8bcb50f436fa New trace implementation; and profile (in a similat vein).
Guido van Rossum <guido@python.org>
parents: 688
diff changeset
3811
43840
73c8e27eb9ce Correction for issue1265 (pdb bug with "with" statement).
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 43815
diff changeset
3812 static int
20257
e3f63a95455f Fix bug in profiler modifications detected only in debug builds.
Fred Drake <fdrake@acm.org>
parents: 20247
diff changeset
3813 call_trace_protected(Py_tracefunc func, PyObject *obj, PyFrameObject *frame,
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3814 int what, PyObject *arg)
20257
e3f63a95455f Fix bug in profiler modifications detected only in debug builds.
Fred Drake <fdrake@acm.org>
parents: 20247
diff changeset
3815 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3816 PyObject *type, *value, *traceback;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3817 int err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3818 PyErr_Fetch(&type, &value, &traceback);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3819 err = call_trace(func, obj, frame, what, arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3820 if (err == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3821 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3822 PyErr_Restore(type, value, traceback);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3823 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3824 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3825 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3826 Py_XDECREF(type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3827 Py_XDECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3828 Py_XDECREF(traceback);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3829 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3830 }
20257
e3f63a95455f Fix bug in profiler modifications detected only in debug builds.
Fred Drake <fdrake@acm.org>
parents: 20247
diff changeset
3831 }
e3f63a95455f Fix bug in profiler modifications detected only in debug builds.
Fred Drake <fdrake@acm.org>
parents: 20247
diff changeset
3832
708
8bcb50f436fa New trace implementation; and profile (in a similat vein).
Guido van Rossum <guido@python.org>
parents: 688
diff changeset
3833 static int
18326
e427afb5637f Revise the interface to the profiling and tracing support for the
Fred Drake <fdrake@acm.org>
parents: 18293
diff changeset
3834 call_trace(Py_tracefunc func, PyObject *obj, PyFrameObject *frame,
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3835 int what, PyObject *arg)
567
8c179d023583 User trace feature.
Guido van Rossum <guido@python.org>
parents: 565
diff changeset
3836 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3837 register PyThreadState *tstate = frame->f_tstate;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3838 int result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3839 if (tstate->tracing)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3840 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3841 tstate->tracing++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3842 tstate->use_tracing = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3843 result = func(obj, frame, what, arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3844 tstate->use_tracing = ((tstate->c_tracefunc != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3845 || (tstate->c_profilefunc != NULL));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3846 tstate->tracing--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3847 return result;
567
8c179d023583 User trace feature.
Guido van Rossum <guido@python.org>
parents: 565
diff changeset
3848 }
8c179d023583 User trace feature.
Guido van Rossum <guido@python.org>
parents: 565
diff changeset
3849
28556
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code
Guido van Rossum <guido@python.org>
parents: 28304
diff changeset
3850 PyObject *
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code
Guido van Rossum <guido@python.org>
parents: 28304
diff changeset
3851 _PyEval_CallTracing(PyObject *func, PyObject *args)
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code
Guido van Rossum <guido@python.org>
parents: 28304
diff changeset
3852 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3853 PyFrameObject *frame = PyEval_GetFrame();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3854 PyThreadState *tstate = frame->f_tstate;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3855 int save_tracing = tstate->tracing;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3856 int save_use_tracing = tstate->use_tracing;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3857 PyObject *result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3858
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3859 tstate->tracing = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3860 tstate->use_tracing = ((tstate->c_tracefunc != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3861 || (tstate->c_profilefunc != NULL));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3862 result = PyObject_Call(func, args, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3863 tstate->tracing = save_tracing;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3864 tstate->use_tracing = save_use_tracing;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3865 return result;
28556
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code
Guido van Rossum <guido@python.org>
parents: 28304
diff changeset
3866 }
78395e5b4782 - New function sys.call_tracing() allows pdb to debug code
Guido van Rossum <guido@python.org>
parents: 28304
diff changeset
3867
55372
79718ee03986 Merged revisions 72487-72488,72879 via svnmerge from
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 54909
diff changeset
3868 /* See Objects/lnotab_notes.txt for a description of how tracing works. */
26110
964d6b79c22e This is Richie Hindle's patch:
Michael W. Hudson <mwh@python.net>
parents: 26109
diff changeset
3869 static int
31872
9f5fe6b23e59 Since the fast_yield branch target was introduced, it appears that most
Tim Peters <tim.peters@gmail.com>
parents: 31797
diff changeset
3870 maybe_call_line_trace(Py_tracefunc func, PyObject *obj,
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3871 PyFrameObject *frame, int *instr_lb, int *instr_ub,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3872 int *instr_prev)
24844
cf5928fab108 This is my patch
Michael W. Hudson <mwh@python.net>
parents: 24718
diff changeset
3873 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3874 int result = 0;
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3875 int line = frame->f_lineno;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3876
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3877 /* If the last instruction executed isn't in the current
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3878 instruction window, reset the window.
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3879 */
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3880 if (frame->f_lasti < *instr_lb || frame->f_lasti >= *instr_ub) {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3881 PyAddrPair bounds;
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3882 line = _PyCode_CheckLineNumber(frame->f_code, frame->f_lasti,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3883 &bounds);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3884 *instr_lb = bounds.ap_lower;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3885 *instr_ub = bounds.ap_upper;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3886 }
61466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3887 /* If the last instruction falls at the start of a line or if
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3888 it represents a jump backwards, update the frame's line
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3889 number and call the trace function. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3890 if (frame->f_lasti == *instr_lb || frame->f_lasti < *instr_prev) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 61186
diff changeset
3891 frame->f_lineno = line;
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3892 result = call_trace(func, obj, frame, PyTrace_LINE, Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3893 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3894 *instr_prev = frame->f_lasti;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3895 return result;
24844
cf5928fab108 This is my patch
Michael W. Hudson <mwh@python.net>
parents: 24718
diff changeset
3896 }
cf5928fab108 This is my patch
Michael W. Hudson <mwh@python.net>
parents: 24718
diff changeset
3897
18326
e427afb5637f Revise the interface to the profiling and tracing support for the
Fred Drake <fdrake@acm.org>
parents: 18293
diff changeset
3898 void
e427afb5637f Revise the interface to the profiling and tracing support for the
Fred Drake <fdrake@acm.org>
parents: 18293
diff changeset
3899 PyEval_SetProfile(Py_tracefunc func, PyObject *arg)
18136
4cb34314bd97 Instead of initializing & interning the strings passed to the profile
Fred Drake <fdrake@acm.org>
parents: 18128
diff changeset
3900 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3901 PyThreadState *tstate = PyThreadState_GET();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3902 PyObject *temp = tstate->c_profileobj;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3903 Py_XINCREF(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3904 tstate->c_profilefunc = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3905 tstate->c_profileobj = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3906 /* Must make sure that tracing is not ignored if 'temp' is freed */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3907 tstate->use_tracing = tstate->c_tracefunc != NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3908 Py_XDECREF(temp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3909 tstate->c_profilefunc = func;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3910 tstate->c_profileobj = arg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3911 /* Flag that tracing or profiling is turned on */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3912 tstate->use_tracing = (func != NULL) || (tstate->c_tracefunc != NULL);
18326
e427afb5637f Revise the interface to the profiling and tracing support for the
Fred Drake <fdrake@acm.org>
parents: 18293
diff changeset
3913 }
e427afb5637f Revise the interface to the profiling and tracing support for the
Fred Drake <fdrake@acm.org>
parents: 18293
diff changeset
3914
e427afb5637f Revise the interface to the profiling and tracing support for the
Fred Drake <fdrake@acm.org>
parents: 18293
diff changeset
3915 void
e427afb5637f Revise the interface to the profiling and tracing support for the
Fred Drake <fdrake@acm.org>
parents: 18293
diff changeset
3916 PyEval_SetTrace(Py_tracefunc func, PyObject *arg)
e427afb5637f Revise the interface to the profiling and tracing support for the
Fred Drake <fdrake@acm.org>
parents: 18293
diff changeset
3917 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3918 PyThreadState *tstate = PyThreadState_GET();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3919 PyObject *temp = tstate->c_traceobj;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3920 _Py_TracingPossible += (func != NULL) - (tstate->c_tracefunc != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3921 Py_XINCREF(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3922 tstate->c_tracefunc = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3923 tstate->c_traceobj = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3924 /* Must make sure that profiling is not ignored if 'temp' is freed */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3925 tstate->use_tracing = tstate->c_profilefunc != NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3926 Py_XDECREF(temp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3927 tstate->c_tracefunc = func;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3928 tstate->c_traceobj = arg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3929 /* Flag that tracing or profiling is turned on */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3930 tstate->use_tracing = ((func != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3931 || (tstate->c_profilefunc != NULL));
18136
4cb34314bd97 Instead of initializing & interning the strings passed to the profile
Fred Drake <fdrake@acm.org>
parents: 18128
diff changeset
3932 }
4cb34314bd97 Instead of initializing & interning the strings passed to the profile
Fred Drake <fdrake@acm.org>
parents: 18128
diff changeset
3933
5368
f2132d1f66a6 Quickly renamed.
Guido van Rossum <guido@python.org>
parents: 5177
diff changeset
3934 PyObject *
13658
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents: 13620
diff changeset
3935 PyEval_GetBuiltins(void)
2098
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c)
Guido van Rossum <guido@python.org>
parents: 2088
diff changeset
3936 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3937 PyFrameObject *current_frame = PyEval_GetFrame();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3938 if (current_frame == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3939 return PyThreadState_GET()->interp->builtins;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3940 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3941 return current_frame->f_builtins;
2098
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c)
Guido van Rossum <guido@python.org>
parents: 2088
diff changeset
3942 }
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c)
Guido van Rossum <guido@python.org>
parents: 2088
diff changeset
3943
5368
f2132d1f66a6 Quickly renamed.
Guido van Rossum <guido@python.org>
parents: 5177
diff changeset
3944 PyObject *
13658
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents: 13620
diff changeset
3945 PyEval_GetLocals(void)
1263
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access
Guido van Rossum <guido@python.org>
parents: 1262
diff changeset
3946 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3947 PyFrameObject *current_frame = PyEval_GetFrame();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3948 if (current_frame == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3949 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3950 PyFrame_FastToLocals(current_frame);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3951 return current_frame->f_locals;
1263
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access
Guido van Rossum <guido@python.org>
parents: 1262
diff changeset
3952 }
65a1e4e9cd54 * Fixed some subtleties with fastlocals. You can no longer access
Guido van Rossum <guido@python.org>
parents: 1262
diff changeset
3953
5368
f2132d1f66a6 Quickly renamed.
Guido van Rossum <guido@python.org>
parents: 5177
diff changeset
3954 PyObject *
13658
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents: 13620
diff changeset
3955 PyEval_GetGlobals(void)
69
cccd534f2280 Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
3956 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3957 PyFrameObject *current_frame = PyEval_GetFrame();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3958 if (current_frame == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3959 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3960 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3961 return current_frame->f_globals;
69
cccd534f2280 Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
3962 }
cccd534f2280 Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
3963
27978
4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject *
Guido van Rossum <guido@python.org>
parents: 27781
diff changeset
3964 PyFrameObject *
13658
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents: 13620
diff changeset
3965 PyEval_GetFrame(void)
1846
5243fb187d36 call_object: print message before abort()
Guido van Rossum <guido@python.org>
parents: 1425
diff changeset
3966 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3967 PyThreadState *tstate = PyThreadState_GET();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3968 return _PyThreadState_GetFrame(tstate);
1846
5243fb187d36 call_object: print message before abort()
Guido van Rossum <guido@python.org>
parents: 1425
diff changeset
3969 }
5243fb187d36 call_object: print message before abort()
Guido van Rossum <guido@python.org>
parents: 1425
diff changeset
3970
2098
b7be0382f9ee __builtins__ mods (and sys_checkinterval for ceval.c)
Guido van Rossum <guido@python.org>
parents: 2088
diff changeset
3971 int
18611
fdb36a0c7e6e Part way to allowing "from __future__ import generators" to communicate
Tim Peters <tim.peters@gmail.com>
parents: 18513
diff changeset
3972 PyEval_MergeCompilerFlags(PyCompilerFlags *cf)
17124
a8301d4ed2b1 If a code object is compiled with nested scopes, define the CO_NESTED flag.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 17114
diff changeset
3973 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3974 PyFrameObject *current_frame = PyEval_GetFrame();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3975 int result = cf->cf_flags != 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3976
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3977 if (current_frame != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3978 const int codeflags = current_frame->f_code->co_flags;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3979 const int compilerflags = codeflags & PyCF_MASK;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3980 if (compilerflags) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3981 result = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3982 cf->cf_flags |= compilerflags;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3983 }
22468
eebae4f60d05 Disable the parser hacks that enabled the "yield" keyword using a future
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 22398
diff changeset
3984 #if 0 /* future keyword */
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3985 if (codeflags & CO_GENERATOR_ALLOWED) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3986 result = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3987 cf->cf_flags |= CO_GENERATOR_ALLOWED;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3988 }
22468
eebae4f60d05 Disable the parser hacks that enabled the "yield" keyword using a future
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 22398
diff changeset
3989 #endif
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3990 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
3991 return result;
17124
a8301d4ed2b1 If a code object is compiled with nested scopes, define the CO_NESTED flag.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 17114
diff changeset
3992 }
a8301d4ed2b1 If a code object is compiled with nested scopes, define the CO_NESTED flag.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 17114
diff changeset
3993
86
a6934380c6e7 "Compiling" version
Guido van Rossum <guido@python.org>
parents: 72
diff changeset
3994
2844
0261bf5b3819 keyword arguments and faster calls
Guido van Rossum <guido@python.org>
parents: 2813
diff changeset
3995 /* External interface to call any callable object.
60130
04e775b33e9e Merged revisions 79555 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59863
diff changeset
3996 The arg must be a tuple or NULL. The kw must be a dict or NULL. */
2844
0261bf5b3819 keyword arguments and faster calls
Guido van Rossum <guido@python.org>
parents: 2813
diff changeset
3997
5368
f2132d1f66a6 Quickly renamed.
Guido van Rossum <guido@python.org>
parents: 5177
diff changeset
3998 PyObject *
13658
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents: 13620
diff changeset
3999 PyEval_CallObjectWithKeywords(PyObject *func, PyObject *arg, PyObject *kw)
2844
0261bf5b3819 keyword arguments and faster calls
Guido van Rossum <guido@python.org>
parents: 2813
diff changeset
4000 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4001 PyObject *result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4002
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4003 if (arg == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4004 arg = PyTuple_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4005 if (arg == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4006 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4007 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4008 else if (!PyTuple_Check(arg)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4009 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4010 "argument list must be a tuple");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4011 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4012 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4013 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4014 Py_INCREF(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4015
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4016 if (kw != NULL && !PyDict_Check(kw)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4017 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4018 "keyword list must be a dictionary");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4019 Py_DECREF(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4020 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4021 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4022
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4023 result = PyObject_Call(func, arg, kw);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4024 Py_DECREF(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4025 return result;
15711
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4026 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4027
35999
9541369b0dca Add const to several API functions that take char *.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 35745
diff changeset
4028 const char *
18933
09df3254b49d Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents: 18611
diff changeset
4029 PyEval_GetFuncName(PyObject *func)
17406
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 17125
diff changeset
4030 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4031 if (PyMethod_Check(func))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4032 return PyEval_GetFuncName(PyMethod_GET_FUNCTION(func));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4033 else if (PyFunction_Check(func))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4034 return _PyUnicode_AsString(((PyFunctionObject*)func)->func_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4035 else if (PyCFunction_Check(func))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4036 return ((PyCFunctionObject*)func)->m_ml->ml_name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4037 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4038 return func->ob_type->tp_name;
17406
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 17125
diff changeset
4039 }
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 17125
diff changeset
4040
35999
9541369b0dca Add const to several API functions that take char *.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 35745
diff changeset
4041 const char *
18933
09df3254b49d Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents: 18611
diff changeset
4042 PyEval_GetFuncDesc(PyObject *func)
17406
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 17125
diff changeset
4043 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4044 if (PyMethod_Check(func))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4045 return "()";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4046 else if (PyFunction_Check(func))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4047 return "()";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4048 else if (PyCFunction_Check(func))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4049 return "()";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4050 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4051 return " object";
17406
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 17125
diff changeset
4052 }
c9e07bc303a2 Fix exception handling for non-PyFunction objects, SF bug 414743.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 17125
diff changeset
4053
26141
6ce9228a3da2 Make private functions static so we don't pollute the namespace
Neal Norwitz <nnorwitz@gmail.com>
parents: 26110
diff changeset
4054 static void
24870
df2326a4894d Inline fast_cfunction() in new call_function().
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 24868
diff changeset
4055 err_args(PyObject *func, int flags, int nargs)
df2326a4894d Inline fast_cfunction() in new call_function().
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 24868
diff changeset
4056 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4057 if (flags & METH_NOARGS)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4058 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4059 "%.200s() takes no arguments (%d given)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4060 ((PyCFunctionObject *)func)->m_ml->ml_name,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4061 nargs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4062 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4063 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4064 "%.200s() takes exactly one argument (%d given)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4065 ((PyCFunctionObject *)func)->m_ml->ml_name,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4066 nargs);
24870
df2326a4894d Inline fast_cfunction() in new call_function().
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 24868
diff changeset
4067 }
df2326a4894d Inline fast_cfunction() in new call_function().
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 24868
diff changeset
4068
35609
23dda92de993 clean-up tracing of C functions. In particular, don't call the trace func
Armin Rigo <arigo@tunes.org>
parents: 35345
diff changeset
4069 #define C_TRACE(x, call) \
32409
77913be294b9 Massive performance improvement for C extension and builtin tracing code
Nicholas Bastin <nick.bastin@gmail.com>
parents: 32398
diff changeset
4070 if (tstate->use_tracing && tstate->c_profilefunc) { \
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4071 if (call_trace(tstate->c_profilefunc, \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4072 tstate->c_profileobj, \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4073 tstate->frame, PyTrace_C_CALL, \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4074 func)) { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4075 x = NULL; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4076 } \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4077 else { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4078 x = call; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4079 if (tstate->c_profilefunc != NULL) { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4080 if (x == NULL) { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4081 call_trace_protected(tstate->c_profilefunc, \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4082 tstate->c_profileobj, \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4083 tstate->frame, PyTrace_C_EXCEPTION, \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4084 func); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4085 /* XXX should pass (type, value, tb) */ \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4086 } else { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4087 if (call_trace(tstate->c_profilefunc, \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4088 tstate->c_profileobj, \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4089 tstate->frame, PyTrace_C_RETURN, \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4090 func)) { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4091 Py_DECREF(x); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4092 x = NULL; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4093 } \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4094 } \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4095 } \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4096 } \
32409
77913be294b9 Massive performance improvement for C extension and builtin tracing code
Nicholas Bastin <nick.bastin@gmail.com>
parents: 32398
diff changeset
4097 } else { \
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4098 x = call; \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4099 }
31796
1c117dbb2def Enable the profiling of C functions (builtins and extensions)
Nicholas Bastin <nick.bastin@gmail.com>
parents: 31768
diff changeset
4100
24868
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 24866
diff changeset
4101 static PyObject *
32301
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
4102 call_function(PyObject ***pp_stack, int oparg
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
4103 #ifdef WITH_TSC
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4104 , uint64* pintr0, uint64* pintr1
32301
41c59d80bbc5 Patch #510695: Add TSC profiling for the VM.
Martin v. Löwis <martin@v.loewis.de>
parents: 32247
diff changeset
4105 #endif
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4106 )
24868
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 24866
diff changeset
4107 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4108 int na = oparg & 0xff;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4109 int nk = (oparg>>8) & 0xff;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4110 int n = na + 2 * nk;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4111 PyObject **pfunc = (*pp_stack) - n - 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4112 PyObject *func = *pfunc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4113 PyObject *x, *w;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4114
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4115 /* Always dispatch PyCFunction first, because these are
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4116 presumed to be the most frequent callable object.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4117 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4118 if (PyCFunction_Check(func) && nk == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4119 int flags = PyCFunction_GET_FLAGS(func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4120 PyThreadState *tstate = PyThreadState_GET();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4121
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4122 PCALL(PCALL_CFUNCTION);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4123 if (flags & (METH_NOARGS | METH_O)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4124 PyCFunction meth = PyCFunction_GET_FUNCTION(func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4125 PyObject *self = PyCFunction_GET_SELF(func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4126 if (flags & METH_NOARGS && na == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4127 C_TRACE(x, (*meth)(self,NULL));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4128 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4129 else if (flags & METH_O && na == 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4130 PyObject *arg = EXT_POP(*pp_stack);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4131 C_TRACE(x, (*meth)(self,arg));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4132 Py_DECREF(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4133 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4134 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4135 err_args(func, flags, na);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4136 x = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4137 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4138 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4139 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4140 PyObject *callargs;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4141 callargs = load_args(pp_stack, na);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4142 READ_TIMESTAMP(*pintr0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4143 C_TRACE(x, PyCFunction_Call(func,callargs,NULL));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4144 READ_TIMESTAMP(*pintr1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4145 Py_XDECREF(callargs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4146 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4147 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4148 if (PyMethod_Check(func) && PyMethod_GET_SELF(func) != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4149 /* optimize access to bound methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4150 PyObject *self = PyMethod_GET_SELF(func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4151 PCALL(PCALL_METHOD);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4152 PCALL(PCALL_BOUND_METHOD);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4153 Py_INCREF(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4154 func = PyMethod_GET_FUNCTION(func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4155 Py_INCREF(func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4156 Py_DECREF(*pfunc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4157 *pfunc = self;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4158 na++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4159 n++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4160 } else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4161 Py_INCREF(func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4162 READ_TIMESTAMP(*pintr0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4163 if (PyFunction_Check(func))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4164 x = fast_function(func, pp_stack, n, na, nk);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4165 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4166 x = do_call(func, pp_stack, na, nk);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4167 READ_TIMESTAMP(*pintr1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4168 Py_DECREF(func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4169 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4170
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4171 /* Clear the stack of the function object. Also removes
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4172 the arguments in case they weren't consumed already
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4173 (fast_function() and err_args() leave them on the stack).
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4174 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4175 while ((*pp_stack) > pfunc) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4176 w = EXT_POP(*pp_stack);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4177 Py_DECREF(w);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4178 PCALL(PCALL_POP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4179 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4180 return x;
24868
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 24866
diff changeset
4181 }
2306001f6eaa Move body of CALL_FUNCTION opcode into helper function.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 24866
diff changeset
4182
24870
df2326a4894d Inline fast_cfunction() in new call_function().
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 24868
diff changeset
4183 /* The fast_function() function optimize calls for which no argument
15711
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4184 tuple is necessary; the objects are passed directly from the stack.
27712
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
4185 For the simplest case -- a function that takes only positional
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
4186 arguments and is called with only positional arguments -- it
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
4187 inlines the most primitive frame setup code from
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
4188 PyEval_EvalCodeEx(), which vastly reduces the checks that must be
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
4189 done before evaluating the frame.
15711
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4190 */
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4191
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4192 static PyObject *
15948
3bc2440427d3 Rich comparisons fall-out:
Guido van Rossum <guido@python.org>
parents: 15899
diff changeset
4193 fast_function(PyObject *func, PyObject ***pp_stack, int n, int na, int nk)
15711
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4194 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4195 PyCodeObject *co = (PyCodeObject *)PyFunction_GET_CODE(func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4196 PyObject *globals = PyFunction_GET_GLOBALS(func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4197 PyObject *argdefs = PyFunction_GET_DEFAULTS(func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4198 PyObject *kwdefs = PyFunction_GET_KW_DEFAULTS(func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4199 PyObject **d = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4200 int nd = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4201
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4202 PCALL(PCALL_FUNCTION);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4203 PCALL(PCALL_FAST_FUNCTION);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4204 if (argdefs == NULL && co->co_argcount == n &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4205 co->co_kwonlyargcount == 0 && nk==0 &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4206 co->co_flags == (CO_OPTIMIZED | CO_NEWLOCALS | CO_NOFREE)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4207 PyFrameObject *f;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4208 PyObject *retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4209 PyThreadState *tstate = PyThreadState_GET();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4210 PyObject **fastlocals, **stack;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4211 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4212
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4213 PCALL(PCALL_FASTER_FUNCTION);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4214 assert(globals != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4215 /* XXX Perhaps we should create a specialized
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4216 PyFrame_New() that doesn't take locals, but does
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4217 take builtins without sanity checking them.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4218 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4219 assert(tstate != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4220 f = PyFrame_New(tstate, co, globals, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4221 if (f == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4222 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4223
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4224 fastlocals = f->f_localsplus;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4225 stack = (*pp_stack) - n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4226
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4227 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4228 Py_INCREF(*stack);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4229 fastlocals[i] = *stack++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4230 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4231 retval = PyEval_EvalFrameEx(f,0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4232 ++tstate->recursion_depth;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4233 Py_DECREF(f);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4234 --tstate->recursion_depth;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4235 return retval;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4236 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4237 if (argdefs != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4238 d = &PyTuple_GET_ITEM(argdefs, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4239 nd = Py_SIZE(argdefs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4240 }
66664
62b61abd02b8 Merge branches/pep-0384.
Martin v. Löwis <martin@v.loewis.de>
parents: 66556
diff changeset
4241 return PyEval_EvalCodeEx((PyObject*)co, globals,
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4242 (PyObject *)NULL, (*pp_stack)-n, na,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4243 (*pp_stack)-2*nk, nk, d, nd, kwdefs,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4244 PyFunction_GET_CLOSURE(func));
15711
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4245 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4246
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4247 static PyObject *
15899
152814f6cd11 This patch makes sure that the function name always appears in the error
Ka-Ping Yee <ping@zesty.ca>
parents: 15830
diff changeset
4248 update_keyword_args(PyObject *orig_kwdict, int nk, PyObject ***pp_stack,
152814f6cd11 This patch makes sure that the function name always appears in the error
Ka-Ping Yee <ping@zesty.ca>
parents: 15830
diff changeset
4249 PyObject *func)
15711
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4250 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4251 PyObject *kwdict = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4252 if (orig_kwdict == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4253 kwdict = PyDict_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4254 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4255 kwdict = PyDict_Copy(orig_kwdict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4256 Py_DECREF(orig_kwdict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4257 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4258 if (kwdict == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4259 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4260 while (--nk >= 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4261 int err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4262 PyObject *value = EXT_POP(*pp_stack);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4263 PyObject *key = EXT_POP(*pp_stack);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4264 if (PyDict_GetItem(kwdict, key) != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4265 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4266 "%.200s%s got multiple values "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4267 "for keyword argument '%U'",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4268 PyEval_GetFuncName(func),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4269 PyEval_GetFuncDesc(func),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4270 key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4271 Py_DECREF(key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4272 Py_DECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4273 Py_DECREF(kwdict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4274 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4275 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4276 err = PyDict_SetItem(kwdict, key, value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4277 Py_DECREF(key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4278 Py_DECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4279 if (err) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4280 Py_DECREF(kwdict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4281 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4282 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4283 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4284 return kwdict;
15711
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4285 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4286
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4287 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4288 update_star_args(int nstack, int nstar, PyObject *stararg,
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4289 PyObject ***pp_stack)
15711
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4290 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4291 PyObject *callargs, *w;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4292
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4293 callargs = PyTuple_New(nstack + nstar);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4294 if (callargs == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4295 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4296 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4297 if (nstar) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4298 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4299 for (i = 0; i < nstar; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4300 PyObject *a = PyTuple_GET_ITEM(stararg, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4301 Py_INCREF(a);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4302 PyTuple_SET_ITEM(callargs, nstack + i, a);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4303 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4304 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4305 while (--nstack >= 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4306 w = EXT_POP(*pp_stack);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4307 PyTuple_SET_ITEM(callargs, nstack, w);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4308 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4309 return callargs;
15711
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4310 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4311
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4312 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4313 load_args(PyObject ***pp_stack, int na)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4314 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4315 PyObject *args = PyTuple_New(na);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4316 PyObject *w;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4317
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4318 if (args == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4319 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4320 while (--na >= 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4321 w = EXT_POP(*pp_stack);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4322 PyTuple_SET_ITEM(args, na, w);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4323 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4324 return args;
15711
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4325 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4326
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4327 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4328 do_call(PyObject *func, PyObject ***pp_stack, int na, int nk)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4329 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4330 PyObject *callargs = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4331 PyObject *kwdict = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4332 PyObject *result = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4333
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4334 if (nk > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4335 kwdict = update_keyword_args(NULL, nk, pp_stack, func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4336 if (kwdict == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4337 goto call_fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4338 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4339 callargs = load_args(pp_stack, na);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4340 if (callargs == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4341 goto call_fail;
27712
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
4342 #ifdef CALL_PROFILE
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4343 /* At this point, we have to look at the type of func to
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4344 update the call stats properly. Do it here so as to avoid
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4345 exposing the call stats machinery outside ceval.c
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4346 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4347 if (PyFunction_Check(func))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4348 PCALL(PCALL_FUNCTION);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4349 else if (PyMethod_Check(func))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4350 PCALL(PCALL_METHOD);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4351 else if (PyType_Check(func))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4352 PCALL(PCALL_TYPE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4353 else if (PyCFunction_Check(func))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4354 PCALL(PCALL_CFUNCTION);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4355 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4356 PCALL(PCALL_OTHER);
27712
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
4357 #endif
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4358 if (PyCFunction_Check(func)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4359 PyThreadState *tstate = PyThreadState_GET();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4360 C_TRACE(result, PyCFunction_Call(func, callargs, kwdict));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4361 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4362 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4363 result = PyObject_Call(func, callargs, kwdict);
43411
a5d37cdcd316 Whitespace cleanup.
Thomas Wouters <thomas@python.org>
parents: 43410
diff changeset
4364 call_fail:
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4365 Py_XDECREF(callargs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4366 Py_XDECREF(kwdict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4367 return result;
15711
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4368 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4369
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4370 static PyObject *
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4371 ext_do_call(PyObject *func, PyObject ***pp_stack, int flags, int na, int nk)
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4372 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4373 int nstar = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4374 PyObject *callargs = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4375 PyObject *stararg = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4376 PyObject *kwdict = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4377 PyObject *result = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4378
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4379 if (flags & CALL_FLAG_KW) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4380 kwdict = EXT_POP(*pp_stack);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4381 if (!PyDict_Check(kwdict)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4382 PyObject *d;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4383 d = PyDict_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4384 if (d == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4385 goto ext_call_fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4386 if (PyDict_Update(d, kwdict) != 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4387 Py_DECREF(d);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4388 /* PyDict_Update raises attribute
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4389 * error (percolated from an attempt
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4390 * to get 'keys' attribute) instead of
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4391 * a type error if its second argument
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4392 * is not a mapping.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4393 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4394 if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4395 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4396 "%.200s%.200s argument after ** "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4397 "must be a mapping, not %.200s",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4398 PyEval_GetFuncName(func),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4399 PyEval_GetFuncDesc(func),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4400 kwdict->ob_type->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4401 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4402 goto ext_call_fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4403 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4404 Py_DECREF(kwdict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4405 kwdict = d;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4406 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4407 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4408 if (flags & CALL_FLAG_VAR) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4409 stararg = EXT_POP(*pp_stack);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4410 if (!PyTuple_Check(stararg)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4411 PyObject *t = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4412 t = PySequence_Tuple(stararg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4413 if (t == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4414 if (PyErr_ExceptionMatches(PyExc_TypeError)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4415 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4416 "%.200s%.200s argument after * "
68822
d3ae3fe3eb97 Issue #7330, #10833: Replace %100s by %.100s and %200s by %.200s
Victor Stinner <victor.stinner@haypocalc.com>
parents: 68587
diff changeset
4417 "must be a sequence, not %.200s",
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4418 PyEval_GetFuncName(func),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4419 PyEval_GetFuncDesc(func),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4420 stararg->ob_type->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4421 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4422 goto ext_call_fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4423 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4424 Py_DECREF(stararg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4425 stararg = t;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4426 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4427 nstar = PyTuple_GET_SIZE(stararg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4428 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4429 if (nk > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4430 kwdict = update_keyword_args(kwdict, nk, pp_stack, func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4431 if (kwdict == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4432 goto ext_call_fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4433 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4434 callargs = update_star_args(na, nstar, stararg, pp_stack);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4435 if (callargs == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4436 goto ext_call_fail;
27712
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
4437 #ifdef CALL_PROFILE
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4438 /* At this point, we have to look at the type of func to
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4439 update the call stats properly. Do it here so as to avoid
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4440 exposing the call stats machinery outside ceval.c
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4441 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4442 if (PyFunction_Check(func))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4443 PCALL(PCALL_FUNCTION);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4444 else if (PyMethod_Check(func))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4445 PCALL(PCALL_METHOD);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4446 else if (PyType_Check(func))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4447 PCALL(PCALL_TYPE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4448 else if (PyCFunction_Check(func))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4449 PCALL(PCALL_CFUNCTION);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4450 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4451 PCALL(PCALL_OTHER);
27712
16856c9514e0 Small function call optimization and special build option for call stats.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 27295
diff changeset
4452 #endif
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4453 if (PyCFunction_Check(func)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4454 PyThreadState *tstate = PyThreadState_GET();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4455 C_TRACE(result, PyCFunction_Call(func, callargs, kwdict));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4456 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4457 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4458 result = PyObject_Call(func, callargs, kwdict);
43410
b06b191b7cfa Merged revisions 58203-58210 via svnmerge from
Thomas Wouters <thomas@python.org>
parents: 43188
diff changeset
4459 ext_call_fail:
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4460 Py_XDECREF(callargs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4461 Py_XDECREF(kwdict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4462 Py_XDECREF(stararg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4463 return result;
15711
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4464 }
2481b5fe86d6 Revised implementation of CALL_FUNCTION and friends.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 15364
diff changeset
4465
36882
6a9c7165b17b Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents: 36877
diff changeset
4466 /* Extract a slice index from a PyInt or PyLong or an object with the
6a9c7165b17b Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents: 36877
diff changeset
4467 nb_index slot defined, and store in *pi.
6a9c7165b17b Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents: 36877
diff changeset
4468 Silently reduce values larger than PY_SSIZE_T_MAX to PY_SSIZE_T_MAX,
6a9c7165b17b Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents: 36877
diff changeset
4469 and silently boost values less than -PY_SSIZE_T_MAX-1 to -PY_SSIZE_T_MAX-1.
36558
d3685f9b7b71 Remove size constraints in SLICE opcodes.
Martin v. Löwis <martin@v.loewis.de>
parents: 36501
diff changeset
4470 Return 0 on error, 1 on success.
21440
30efe46f8e3c _PyEval_SliceIndex(): Repaired the comments, and added XXX comments
Tim Peters <tim.peters@gmail.com>
parents: 21398
diff changeset
4471 */
21441
05ad7a69d933 _PyEval_SliceIndex(): explain why a NULL argument is allowed (thanks
Tim Peters <tim.peters@gmail.com>
parents: 21440
diff changeset
4472 /* Note: If v is NULL, return success without storing into *pi. This
05ad7a69d933 _PyEval_SliceIndex(): explain why a NULL argument is allowed (thanks
Tim Peters <tim.peters@gmail.com>
parents: 21440
diff changeset
4473 is because_PyEval_SliceIndex() is called by apply_slice(), which can be
05ad7a69d933 _PyEval_SliceIndex(): explain why a NULL argument is allowed (thanks
Tim Peters <tim.peters@gmail.com>
parents: 21440
diff changeset
4474 called by the SLICE opcode with v and/or w equal to NULL.
21440
30efe46f8e3c _PyEval_SliceIndex(): Repaired the comments, and added XXX comments
Tim Peters <tim.peters@gmail.com>
parents: 21398
diff changeset
4475 */
12614
8d7ad3818ea6 Trent Mick:
Guido van Rossum <guido@python.org>
parents: 12579
diff changeset
4476 int
36501
7fdc639bc5b4 Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents: 36475
diff changeset
4477 _PyEval_SliceIndex(PyObject *v, Py_ssize_t *pi)
69
cccd534f2280 Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
4478 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4479 if (v != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4480 Py_ssize_t x;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4481 if (PyIndex_Check(v)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4482 x = PyNumber_AsSsize_t(v, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4483 if (x == -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4484 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4485 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4486 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4487 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4488 "slice indices must be integers or "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4489 "None or have an __index__ method");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4490 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4491 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4492 *pi = x;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4493 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4494 return 1;
69
cccd534f2280 Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
4495 }
cccd534f2280 Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
4496
42132
863ed7cd45dc Merged revisions 56020-56124 via svnmerge from
Guido van Rossum <guido@python.org>
parents: 42013
diff changeset
4497 #define CANNOT_CATCH_MSG "catching classes that do not inherit from "\
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4498 "BaseException is not allowed"
40942
4b9d0dac79cc You can no longer catch non-BaseException objects; TypeError is raised if such
Brett Cannon <bcannon@gmail.com>
parents: 40937
diff changeset
4499
5368
f2132d1f66a6 Quickly renamed.
Guido van Rossum <guido@python.org>
parents: 5177
diff changeset
4500 static PyObject *
13658
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents: 13620
diff changeset
4501 cmp_outcome(int op, register PyObject *v, register PyObject *w)
69
cccd534f2280 Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
4502 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4503 int res = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4504 switch (op) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4505 case PyCmp_IS:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4506 res = (v == w);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4507 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4508 case PyCmp_IS_NOT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4509 res = (v != w);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4510 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4511 case PyCmp_IN:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4512 res = PySequence_Contains(w, v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4513 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4514 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4515 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4516 case PyCmp_NOT_IN:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4517 res = PySequence_Contains(w, v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4518 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4519 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4520 res = !res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4521 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4522 case PyCmp_EXC_MATCH:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4523 if (PyTuple_Check(w)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4524 Py_ssize_t i, length;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4525 length = PyTuple_Size(w);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4526 for (i = 0; i < length; i += 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4527 PyObject *exc = PyTuple_GET_ITEM(w, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4528 if (!PyExceptionClass_Check(exc)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4529 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4530 CANNOT_CATCH_MSG);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4531 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4532 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4533 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4534 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4535 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4536 if (!PyExceptionClass_Check(w)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4537 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4538 CANNOT_CATCH_MSG);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4539 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4540 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4541 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4542 res = PyErr_GivenExceptionMatches(v, w);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4543 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4544 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4545 return PyObject_RichCompare(v, w, op);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4546 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4547 v = res ? Py_True : Py_False;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4548 Py_INCREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4549 return v;
69
cccd534f2280 Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
4550 }
cccd534f2280 Initial revision
Guido van Rossum <guido@python.org>
parents:
diff changeset
4551
14038
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import
Thomas Wouters <thomas@python.org>
parents: 13930
diff changeset
4552 static PyObject *
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import
Thomas Wouters <thomas@python.org>
parents: 13930
diff changeset
4553 import_from(PyObject *v, PyObject *name)
72
5e8a0b40a4bd Free parse tree after compiling.
Guido van Rossum <guido@python.org>
parents: 69
diff changeset
4554 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4555 PyObject *x;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4556
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4557 x = PyObject_GetAttr(v, name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4558 if (x == NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4559 PyErr_Format(PyExc_ImportError, "cannot import name %S", name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4560 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4561 return x;
14038
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import
Thomas Wouters <thomas@python.org>
parents: 13930
diff changeset
4562 }
15948
3bc2440427d3 Rich comparisons fall-out:
Guido van Rossum <guido@python.org>
parents: 15899
diff changeset
4563
14038
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import
Thomas Wouters <thomas@python.org>
parents: 13930
diff changeset
4564 static int
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import
Thomas Wouters <thomas@python.org>
parents: 13930
diff changeset
4565 import_all_from(PyObject *locals, PyObject *v)
18385172fac0 Apply SF patch #101135, adding 'import module as m' and 'from module import
Thomas Wouters <thomas@python.org>
parents: 13930
diff changeset
4566 {
72926
db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId.
Martin v. Löwis <martin@v.loewis.de>
parents: 72925
diff changeset
4567 _Py_IDENTIFIER(__all__);
db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId.
Martin v. Löwis <martin@v.loewis.de>
parents: 72925
diff changeset
4568 _Py_IDENTIFIER(__dict__);
db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId.
Martin v. Löwis <martin@v.loewis.de>
parents: 72925
diff changeset
4569 PyObject *all = _PyObject_GetAttrId(v, &PyId___all__);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4570 PyObject *dict, *name, *value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4571 int skip_leading_underscores = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4572 int pos, err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4573
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4574 if (all == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4575 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4576 return -1; /* Unexpected error */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4577 PyErr_Clear();
72926
db4aa878cea2 Port SetAttrString/HasAttrString to SetAttrId/GetAttrId.
Martin v. Löwis <martin@v.loewis.de>
parents: 72925
diff changeset
4578 dict = _PyObject_GetAttrId(v, &PyId___dict__);
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4579 if (dict == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4580 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4581 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4582 PyErr_SetString(PyExc_ImportError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4583 "from-import-* object has no __dict__ and no __all__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4584 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4585 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4586 all = PyMapping_Keys(dict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4587 Py_DECREF(dict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4588 if (all == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4589 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4590 skip_leading_underscores = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4591 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4592
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4593 for (pos = 0, err = 0; ; pos++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4594 name = PySequence_GetItem(all, pos);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4595 if (name == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4596 if (!PyErr_ExceptionMatches(PyExc_IndexError))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4597 err = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4598 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4599 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4600 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4601 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4602 if (skip_leading_underscores &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4603 PyUnicode_Check(name) &&
72475
8beaa9a37387 Implement PEP 393.
Martin v. Löwis <martin@v.loewis.de>
parents: 71481
diff changeset
4604 PyUnicode_READY(name) != -1 &&
8beaa9a37387 Implement PEP 393.
Martin v. Löwis <martin@v.loewis.de>
parents: 71481
diff changeset
4605 PyUnicode_READ_CHAR(name, 0) == '_')
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4606 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4607 Py_DECREF(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4608 continue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4609 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4610 value = PyObject_GetAttr(v, name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4611 if (value == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4612 err = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4613 else if (PyDict_CheckExact(locals))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4614 err = PyDict_SetItem(locals, name, value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4615 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4616 err = PyObject_SetItem(locals, name, value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4617 Py_DECREF(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4618 Py_XDECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4619 if (err != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4620 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4621 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4622 Py_DECREF(all);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4623 return err;
72
5e8a0b40a4bd Free parse tree after compiling.
Guido van Rossum <guido@python.org>
parents: 69
diff changeset
4624 }
5e8a0b40a4bd Free parse tree after compiling.
Guido van Rossum <guido@python.org>
parents: 69
diff changeset
4625
15948
3bc2440427d3 Rich comparisons fall-out:
Guido van Rossum <guido@python.org>
parents: 15899
diff changeset
4626 static void
42860
bf1a53cc6e65 Use unicode
Neal Norwitz <nnorwitz@gmail.com>
parents: 42334
diff changeset
4627 format_exc_check_arg(PyObject *exc, const char *format_str, PyObject *obj)
14268
cd8b815cb196 Better error message with UnboundLocalError
Paul Prescod <prescod@prescod.net>
parents: 14238
diff changeset
4628 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4629 const char *obj_str;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4630
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4631 if (!obj)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4632 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4633
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4634 obj_str = _PyUnicode_AsString(obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4635 if (!obj_str)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4636 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4637
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4638 PyErr_Format(exc, format_str, obj_str);
14268
cd8b815cb196 Better error message with UnboundLocalError
Paul Prescod <prescod@prescod.net>
parents: 14238
diff changeset
4639 }
5049
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
4640
64620
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4641 static void
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4642 format_exc_unbound(PyCodeObject *co, int oparg)
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4643 {
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4644 PyObject *name;
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4645 /* Don't stomp existing exception */
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4646 if (PyErr_Occurred())
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4647 return;
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4648 if (oparg < PyTuple_GET_SIZE(co->co_cellvars)) {
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4649 name = PyTuple_GET_ITEM(co->co_cellvars,
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4650 oparg);
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4651 format_exc_check_arg(
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4652 PyExc_UnboundLocalError,
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4653 UNBOUNDLOCAL_ERROR_MSG,
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4654 name);
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4655 } else {
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4656 name = PyTuple_GET_ITEM(co->co_freevars, oparg -
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4657 PyTuple_GET_SIZE(co->co_cellvars));
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4658 format_exc_check_arg(PyExc_NameError,
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4659 UNBOUNDFREE_ERROR_MSG, name);
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4660 }
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4661 }
25cc226dc9bd #4617: Previously it was illegal to delete a name from the local
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 64439
diff changeset
4662
72605
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4663 static PyObject *
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4664 unicode_concatenate(PyObject *v, PyObject *w,
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4665 PyFrameObject *f, unsigned char *next_instr)
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4666 {
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4667 PyObject *res;
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4668 if (Py_REFCNT(v) == 2) {
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4669 /* In the common case, there are 2 references to the value
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4670 * stored in 'variable' when the += is performed: one on the
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4671 * value stack (in 'v') and one still stored in the
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4672 * 'variable'. We try to delete the variable now to reduce
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4673 * the refcnt to 1.
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4674 */
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4675 switch (*next_instr) {
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4676 case STORE_FAST:
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4677 {
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4678 int oparg = PEEKARG();
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4679 PyObject **fastlocals = f->f_localsplus;
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4680 if (GETLOCAL(oparg) == v)
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4681 SETLOCAL(oparg, NULL);
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4682 break;
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4683 }
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4684 case STORE_DEREF:
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4685 {
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4686 PyObject **freevars = (f->f_localsplus +
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4687 f->f_code->co_nlocals);
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4688 PyObject *c = freevars[PEEKARG()];
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4689 if (PyCell_GET(c) == v)
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4690 PyCell_Set(c, NULL);
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4691 break;
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4692 }
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4693 case STORE_NAME:
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4694 {
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4695 PyObject *names = f->f_code->co_names;
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4696 PyObject *name = GETITEM(names, PEEKARG());
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4697 PyObject *locals = f->f_locals;
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4698 if (PyDict_CheckExact(locals) &&
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4699 PyDict_GetItem(locals, name) == v) {
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4700 if (PyDict_DelItem(locals, name) != 0) {
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4701 PyErr_Clear();
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4702 }
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4703 }
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4704 break;
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4705 }
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4706 }
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4707 }
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4708 res = v;
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4709 PyUnicode_Append(&res, w);
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4710 return res;
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4711 }
07d27d865e2c ceval.c: restore str+=str optimization
Victor Stinner <victor.stinner@haypocalc.com>
parents: 72558
diff changeset
4712
5049
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
4713 #ifdef DYNAMIC_EXECUTION_PROFILE
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
4714
20438
08d7a6756bfe make getarray static - it's only called from ceval.c and is not an
Skip Montanaro <skip@pobox.com>
parents: 20409
diff changeset
4715 static PyObject *
13658
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents: 13620
diff changeset
4716 getarray(long a[256])
5049
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
4717 {
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4718 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4719 PyObject *l = PyList_New(256);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4720 if (l == NULL) return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4721 for (i = 0; i < 256; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4722 PyObject *x = PyLong_FromLong(a[i]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4723 if (x == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4724 Py_DECREF(l);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4725 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4726 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4727 PyList_SetItem(l, i, x);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4728 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4729 for (i = 0; i < 256; i++)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4730 a[i] = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4731 return l;
5049
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
4732 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
4733
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
4734 PyObject *
13658
f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern'
Thomas Wouters <thomas@python.org>
parents: 13620
diff changeset
4735 _Py_GetDXProfile(PyObject *self, PyObject *args)
5049
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
4736 {
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
4737 #ifndef DXPAIRS
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4738 return getarray(dxp);
5049
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
4739 #else
61467
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4740 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4741 PyObject *l = PyList_New(257);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4742 if (l == NULL) return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4743 for (i = 0; i < 257; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4744 PyObject *x = getarray(dxpairs[i]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4745 if (x == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4746 Py_DECREF(l);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4747 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4748 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4749 PyList_SetItem(l, i, x);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4750 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 59858
diff changeset
4751 return l;
5049
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
4752 #endif
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
4753 }
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
4754
946b2b2a7622 Patches for (two forms of) optional dynamic execution profiling --
Guido van Rossum <guido@python.org>
parents: 5048
diff changeset
4755 #endif