8000 Merge branch 'master' into wip-peg_generator-3.7 · python/cpython@592f0e5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 592f0e5

Browse files
serhiy-storchakaserhiy-storchaka
committed
Merge branch 'master' into wip-peg_generator-3.7
2 parents e2fd9de + bb4a585 commit 592f0e5

File tree

222 files changed

+2752
-1081
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

222 files changed

+2752
-1081
lines changed

‎Doc/c-api/contextvars.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@ Context object management functions:
101101
current context for the current thread. Returns ``0`` on success,
102102
and ``-1`` on error.
103103
104-
.. c:function:: int PyContext_ClearFreeList()
105-
106-
Clear the context variable free list. Return the total number of
107-
freed items. This function always succeeds.
108-
109104
110105
Context variable functions:
111106

‎Doc/c-api/dict.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,3 @@ Dictionary Objects
232232
for key, value in seq2:
233233
if override or key not in a:
234234
a[key] = value
235-
236-
237-
.. c:function:: int PyDict_ClearFreeList()
238-
239-
Clear the free list. Return the total number of freed items.
240-
241-
.. versionadded:: 3.3

‎Doc/c-api/float.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,3 @@ Floating Point Objects
7676
.. c:function:: double PyFloat_GetMin()
7777
7878
Return the minimum no 741A rmalized positive float *DBL_MIN* as C :c:type:`double`.
79-
80-
.. c:function:: int PyFloat_ClearFreeList()
81-
82-
Clear the float free list. Return the number of items that could not
83-
be freed.

‎Doc/c-api/init.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,8 +1074,10 @@ All of the following functions must be called after :c:func:`Py_Initialize`.
10741074
10751075
.. c:function:: PyFrameObject* PyThreadState_GetFrame(PyThreadState *tstate)
10761076
1077-
Get the current frame of the Python thread state *tstate*. It can be
1078-
``NULL`` if no frame is currently executing.
1077+
Get the current frame of the Python thread state *tstate*.
1078+
1079+
Return a strong reference. Return ``NULL`` if no frame is currently
1080+
executing.
10791081
10801082
See also :c:func:`PyEval_GetFrame`.
10811083

‎Doc/c-api/list.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,3 @@ List Objects
142142
143143
Return a new tuple object containing the contents of *list*; equivalent to
144144
``tuple(list)``.
145-
146-
147-
.. c:function:: int PyList_ClearFreeList()
148-
149-
Clear the free list. Return the total number of freed items.
150-
151-
.. versionadded:: 3.3

‎Doc/c-api/method.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,3 @@ no longer available.
9292
.. c:function:: PyObject* PyMethod_GET_SELF(PyObject *meth)
9393
9494
Macro version of :c:func:`PyMethod_Self` which avoids error checking.
95-
96-
97-
.. c:function:: int PyMethod_ClearFreeList()
98-
99-
Clear the free list. Return the total number of freed items.
100-

‎Doc/c-api/reflection.rst

+24Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,34 @@ Reflection
3131
See also :c:func:`PyThreadState_GetFrame`.
3232
3333
34+
.. c:function:: int PyFrame_GetBack(PyFrameObject *frame)
35+
36+
Get the *frame* next outer frame.
37+
38+
Return a strong reference, or ``NULL`` if *frame* has no outer frame.
39+
40+
*frame* must not be ``NULL``.
41+
42+
.. versionadded:: 3.9
43+
44+
45+
.. c:function:: int PyFrame_GetCode(PyFrameObject *frame)
46+
47+
Get the *frame* code.
48+
49+
Return a strong reference.
50+
51+
*frame* must not be ``NULL``. The result (frame code) cannot be ``NULL``.
52+
53+
.. versionadded:: 3.9
54+
55+
3456
.. c:function:: int PyFrame_GetLineNumber(PyFrameObject *frame)
3557
3658
Return the line number that *frame* is currently executing.
3759
60+
*frame* must not be ``NULL``.
61+
3862
3963
.. c:function:: const char* PyEval_GetFuncName(PyObject *func)
4064

‎Doc/c-api/set.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,3 @@ subtypes but not for instances of :class:`frozenset` or its subtypes.
157157
.. c:function:: int PySet_Clear(PyObject *set)
158158
159159
Empty an existing set of all elements.
160-
161-
162-
.. c:function:: int PySet_ClearFreeList()
163-
164-
Clear the free list. Return the total number of freed items.
165-
166-
.. versionadded:: 3.3

‎Doc/c-api/tuple.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,6 @@ Tuple Objects
111111
raises :exc:`MemoryError` or :exc:`SystemError`.
112112
113113
114-
.. c:function:: int PyTuple_ClearFreeList()
115-
116-
Clear the free list. Return the total number of freed items.
117-
118-
119114
Struct Sequence Objects
120115
-----------------------
121116

‎Doc/library/enum.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,10 @@ overridden::
273273
the next :class:`int` in sequence with the last :class:`int` provided, but
274274
the way it does this is an implementation detail and may change.
275275

276+
.. note::
277+
278+
The :meth:`_generate_next_value_` method must be defined before any members.
279+
276280
Iteration
277281
---------
278282

‎Doc/whatsnew/3.9.rst

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,13 @@ Optimizations
537537
Build and C API Changes
538538
=======================
539539

540+
* New :c:func:`PyFrame_GetCode` function: get a frame code.
541+
New :c:func:`PyFrame_GetBack` function: get the frame next outer frame.
542+
(Contributed by Victor Stinner in :issue:`40421`.)
543+
544+
* Add :c:func:`PyFrame_GetLineNumber` to the limited C API.
545+
(Contributed by Victor Stinner in :issue:`40421`.)
546+
540547
* New :c:func:`PyThreadState_GetInterpreter` and
541548
:c:func:`PyInterpreterState_Get` functions to get the interpreter.
542549
New :c:func:`PyThreadState_GetFrame` function to get the current frame of a
@@ -666,6 +673,19 @@ Build and C API Changes
666673
the garbage collector respectively. (Contributed by Pablo Galindo in
667674
:issue:`40241`.)
668675

676+
* Remove the following functions from the C API. Call :c:func:`PyGC_Collect`
677+
explicitly to free all free lists.
678+
(Contributed by Victor Stinner in :issue:`40428`.)
679+
680+
* ``PyAsyncGen_ClearFreeLists()``
681+
* ``PyContext_ClearFreeList()``
682+
* ``PyDict_ClearFreeList()``
683+
* ``PyFloat_ClearFreeList()``
684+
* ``PyFrame_ClearFreeList()``
685+
* ``PyList_ClearFreeList()``
686+
* ``PySet_ClearFreeList()``
687+
* ``PyTuple_ClearFreeList()``
688+
669689

670690
Deprecated
671691
==========

‎Include/Python.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@
114114
#include "classobject.h"
115115
#include "fileobject.h"
116116
#include "pycapsule.h"
117+
#include "code.h"
118+
#include "pyframe.h"
117119
#include "traceback.h"
118120
#include "sliceobject.h"
119121
#include "cellobject.h"

‎Include/ceval.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,10 @@ Py_DEPRECATED(3.9) PyAPI_FUNC(PyObject *) PyEval_CallFunction(
2828
Py_DEPRECATED(3.9) PyAPI_FUNC(PyObject *) PyEval_CallMethod(
2929
PyObject *obj, const char *name, const char *format, ...);
3030

31-
struct _frame; /* Avoid including frameobject.h */
32-
3331
PyAPI_FUNC(PyObject *) PyEval_GetBuiltins(void);
3432
PyAPI_FUNC(PyObject *) PyEval_GetGlobals(void);
3533
PyAPI_FUNC(PyObject *) PyEval_GetLocals(void);
36-
PyAPI_FUNC(struct _frame *) PyEval_GetFrame(void);
34+
PyAPI_FUNC(PyFrameObject *) PyEval_GetFrame(void);
3735

3836
PyAPI_FUNC(int) Py_AddPendingCall(int (*func)(void *), void *arg);
3937
PyAPI_FUNC(int) Py_MakePendingCalls(void);
@@ -80,8 +78,8 @@ PyAPI_FUNC(void) Py_LeaveRecursiveCall(void);
8078
PyAPI_FUNC(const char *) PyEval_GetFuncName(PyObject *);
8179
PyAPI_FUNC(const char *) PyEval_GetFuncDesc(PyObject *);
8280

83-
PyAPI_FUNC(PyObject *) PyEval_EvalFrame(struct _frame *);
84-
PyAPI_FUNC(PyObject *) PyEval_EvalFrameEx(struct _frame *f, int exc);
81+
PyAPI_FUNC(PyObject *) PyEval_EvalFrame(PyFrameObject *);
82+
PyAPI_FUNC(PyObject *) PyEval_EvalFrameEx(PyFrameObject *f, int exc);
8583

8684
/* Interface for threads.
8785

‎Include/code.h

Lines changed: 4 additions & 164 deletions
Original file line numberDiff line numberDiff line change
@@ -1,180 +1,20 @@
11
/* Definitions for bytecode */
22

3-
#ifndef Py_LIMITED_API
43
#ifndef Py_CODE_H
54
#define Py_CODE_H
65
#ifdef __cplusplus
76
extern "C" {
87
#endif
98

10-
typedef uint16_t _Py_CODEUNIT;
11-
12-
#ifdef WORDS_BIGENDIAN
13-
# define _Py_OPCODE(word) ((word) >> 8)
14-
# define _Py_OPARG(word) ((word) & 255)
15-
#else
16-
# define _Py_OPCODE(word) ((word) & 255)
17-
# define _Py_OPARG(word) ((word) >> 8)
18-
#endif
19-
20-
typedef struct _PyOpcache _PyOpcache;
21-
22-
/* Bytecode object */
23-
typedef struct {
24-
PyObject_HEAD
25-
int co_argcount; /* #arguments, except *args */
26-
int co_posonlyargcount; /* #positional only arguments */
27-
int co_kwonlyargcount; /* #keyword only arguments */
28-
int co_nlocals; /* #local variables */
29-
int co_stacksize; /* #entries needed for evaluation stack */
30-
int co_flags; /* CO_..., see below */
31-
int co_firstlineno; /* first source line number */
32-
PyObject *co_code; /* instruction opcodes */
33-
PyObject *co_consts; /* list (constants used) */
34-
PyObject *co_names; /* list of strings (names used) */
35-
PyObject *co_varnames; /* tuple of strings (local variable names) */
36-
PyObject *co_freevars; /* tuple of strings (free variable names) */
37-
PyObject *co_cellvars; /* tuple of strings (cell variable names) */
38-
/* The rest aren't used in either hash or comparisons, except for co_name,
39-
used in both. This is done to preserve the name and line number
40-
for tracebacks and debuggers; otherwise, constant de-duplication
41-
would collapse identical functions/lambdas defined on different lines.
42-
*/
43-
Py_ssize_t *co_cell2arg; /* Maps cell vars which are arguments. */
44-
PyObject *co_filename; /* unicode (where it was loaded from) */
45-
PyObject *co_name; /* unicode (name, for reference) */
46-
PyObject *co_lnotab; /* string (encoding addr<->lineno mapping) See
47-
Objects/lnotab_notes.txt for details. */
48-
void *co_zombieframe; /* for optimization only (see frameobject.c) */
49-
PyObject *co_weakreflist; /* to support weakrefs to code objects */
50-
/* Scratch space for extra data relating to the code object.
51-
Type is a void* to keep the format private in codeobject.c to force
52-
people to go through the proper APIs. */
53-
void *co_extra;
54-
55-
/* Per opcodes just-in-time cache
56-
*
57-
* To reduce cache size, we use indirect mapping from opcode index to
58-
* cache object:
59-
* cache = co_opcache[co_opcache_map[next_instr - first_instr] - 1]
60-
*/
61-
62-
// co_opcache_map is indexed by (next_instr - first_instr).
63-
// * 0 means there is no cache for this opcode.
64-
// * n > 0 means there is cache in co_opcache[n-1].
65-
unsigned char *co_opcache_map;
66-
_PyOpcache *co_opcache;
67-
int co_opcache_flag; // used to determine when create a cache.
68-
unsigned char co_opcache_size; // length of co_opcache.
69-
} PyCodeObject;
70-
71-
/* Masks for co_flags above */
72-
#define CO_OPTIMIZED 0x0001
73-
#define CO_NEWLOCALS 0x0002
74-
#define CO_VARARGS 0x0004
75-
#define CO_VARKEYWORDS 0x0008
76-
#define CO_NESTED 0x0010
77-
#define CO_GENERATOR 0x0020
78-
/* The CO_NOFREE flag is set if there are no free or cell variables.
79-
This information is redundant, but it allows a single flag test
80-
to determine whether there is any extra work to be done when the
81-
call frame it setup.
82-
*/
83-
#define CO_NOFREE 0x0040
84-
85-
/* The CO_COROUTINE flag is set for coroutine functions (defined with
86-
``async def`` keywords) */
87-
#define CO_COROUTINE 0x0080
88-
#define CO_ITERABLE_COROUTINE 0x0100
89-
#define CO_ASYNC_GENERATOR 0x0200
90-
91-
/* bpo-39562: These constant values are changed in Python 3.9
92-
to prevent collision with compiler flags. CO_FUTURE_ and PyCF_
93-
constants must be kept unique. PyCF_ constants can use bits from
94-
0x0100 to 0x10000. CO_FUTURE_ constants use bits starting at 0x20000. */
95-
#define CO_FUTURE_DIVISION 0x20000
96-
#define CO_FUTURE_ABSOLUTE_IMPORT 0x40000 /* do absolute imports by default */
97-
#define CO_FUTURE_WITH_STATEMENT 0x80000
98-
#define CO_FUTURE_PRINT_FUNCTION 0x100000
99-
#define CO_FUTURE_UNICODE_LITERALS 0x200000
100-
101-
#define CO_FUTURE_BARRY_AS_BDFL 0x400000
102-
#define CO_FUTURE_GENERATOR_STOP 0x800000
103-
#define CO_FUTURE_ANNOTATIONS 0x1000000
104-
105-
/* This value is found in the co_cell2arg array when the associated cell
106-
variable does not correspond to an argument. */
107-
#define CO_CELL_NOT_AN_ARG (-1)
108-
109-
/* This should be defined if a future statement modifies the syntax.
110-
For example, when a keyword is added.
111-
*/
112-
#define PY_PARSER_REQUIRES_FUTURE_KEYWORD
113-
114-
#define CO_MAXBLOCKS 20 /* Max static block nesting within a function */
115-
116-
PyAPI_DATA(PyTypeObject) PyCode_Type;
117-
118-
#define PyCode_Check(op) Py_IS_TYPE(op, &PyCode_Type)
119-
#define PyCode_GetNumFree(op) (PyTuple_GET_SIZE((op)->co_freevars))
120-
121-
/* Public interface */
122-
PyAPI_FUNC(PyCodeObject *) PyCode_New(
123-
int, int, int, int, int, PyObject *, PyObject *,
124-
PyObject *, PyObject *, PyObject *, PyObject *,
125-
PyObject *, PyObject *, int, PyObject *);
126-
127-
PyAPI_FUNC(PyCodeObject *) PyCode_NewWithPosOnlyArgs(
128-
int, int, int, int, int, int, PyObject *, PyObject *,
129-
PyObject *, PyObject *, PyObject *, PyObject *,
130-
PyObject *, PyObject *, int, PyObject *);
131-
/* same as struct above */
132-
133-
/* Creates a new empty code object with the specified source location. */
134-
PyAPI_FUNC(PyCodeObject *)
135-
PyCode_NewEmpty(const char *filename, const char *funcname, int firstlineno);
136-
137-
/* Return the line number associated with the specified bytecode index
138-
in this code object. If you just need the line number of a frame,
139-
use PyFrame_GetLineNumber() instead. */
140-
PyAPI_FUNC(int) PyCode_Addr2Line(PyCodeObject *, int);
141-
142-
/* for internal use only */
143-
typedef struct _addr_pair {
144-
int ap_lower;
145-
int ap_upper;
146-
} PyAddrPair;
147-
148-
#ifndef Py_LIMITED_API
149-
/* Update *bounds to describe the first and one-past-the-last instructions in the
150-
same line as lasti. Return the number of that line.
151-
*/
152-
PyAPI_FUNC(int) _PyCode_CheckLineNumber(PyCodeObject* co,
153-
int lasti, PyAddrPair *bounds);
154-
155-
/* Create a comparable key used to compare constants taking in account the
156-
* object type. It is used to make sure types are not coerced (e.g., float and
157-
* complex) _and_ to distinguish 0.0 from -0.0 e.g. on IEEE platforms
158-
*
159-
* Return (type(obj), obj, ...): a tuple with variable size (at least 2 items)
160-
* depending on the type and the value. The type is the first item to not
161-
* compare bytes and str which can raise a BytesWarning exception. */
162-
PyAPI_FUNC(PyObject*) _PyCode_ConstantKey(PyObject *obj);
163-
#endif
164-
165-
PyAPI_FUNC(PyObject*) PyCode_Optimize(PyObject *code, PyObject* consts,
166-
PyObject *names, PyObject *lnotab);
167-
9+
typedef struct PyCodeObject PyCodeObject;
16810

16911
#ifndef Py_LIMITED_API
170-
PyAPI_FUNC(int) _PyCode_GetExtra(PyObject *code, Py_ssize_t index,
171-
void **extra);
172-
PyAPI_FUNC(int) _PyCode_SetExtra(PyObject *code, Py_ssize_t index,
173-
void *extra);
12+
# define Py_CPYTHON_CODE_H
13+
# include "cpython/code.h"
14+
# undef Py_CPYTHON_CODE_H
17415
#endif
17516

17617
#ifdef __cplusplus
17718
}
17819
#endif
17920
#endif /* !Py_CODE_H */
180-
#endif /* Py_LIMITED_API */

‎Include/compile.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#define Py_COMPILE_H
33

44
#ifndef Py_LIMITED_API
5-
#include "code.h"
65

76
#ifdef __cplusplus
87
extern "C" {

0 commit comments

Comments
 (0)
0