diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2016-09-11 10:48:15 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-09-11 10:48:15 (GMT) |
| commit | ab8740058a7f76f1438dc18a2ffd918da4f8118d (patch) | |
| tree | f4c763c6e8f6281255b326a17eaaae2c1b237e73 /Objects | |
| parent | bdb847ae99512e0985e1a3e955c90e23d36f8804 (diff) | |
| download | cpython-ab8740058a7f76f1438dc18a2ffd918da4f8118d.zip cpython-ab8740058a7f76f1438dc18a2ffd918da4f8118d.tar.gz cpython-ab8740058a7f76f1438dc18a2ffd918da4f8118d.tar.bz2 | |
Issue #27129: Replaced wordcode related magic constants with macros.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/frameobject.c | 4 | ||||
| -rw-r--r-- | Objects/genobject.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Objects/frameobject.c b/Objects/frameobject.c index b115614..62f9f34 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -189,7 +189,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno) memset(blockstack, '\0', sizeof(blockstack)); memset(in_finally, '\0', sizeof(in_finally)); blockstack_top = 0; - for (addr = 0; addr < code_len; addr += 2) { + for (addr = 0; addr < code_len; addr += sizeof(_Py_CODEUNIT)) { unsigned char op = code[addr]; switch (op) { case SETUP_LOOP: @@ -273,7 +273,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno) * can tell whether the jump goes into any blocks without coming out * again - in that case we raise an exception below. */ delta_iblock = 0; - for (addr = min_addr; addr < max_addr; addr += 2) { + for (addr = min_addr; addr < max_addr; addr += sizeof(_Py_CODEUNIT)) { unsigned char op = code[addr]; switch (op) { case SETUP_LOOP: diff --git a/Objects/genobject.c b/Objects/genobject.c index bc5309a..7a1e9fd 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -390,7 +390,7 @@ _PyGen_yf(PyGenObject *gen) PyObject *bytecode = f->f_code->co_code; unsigned char *code = (unsigned char *)PyBytes_AS_STRING(bytecode); - if (code[f->f_lasti + 2] != YIELD_FROM) + if (code[f->f_lasti + sizeof(_Py_CODEUNIT)] != YIELD_FROM) return NULL; yf = f->f_stacktop[-1]; Py_INCREF(yf); @@ -498,7 +498,7 @@ _gen_throw(PyGenObject *gen, int close_on_genexit, assert(ret == yf); Py_DECREF(ret); /* Termination repetition of YIELD_FROM */ - gen->gi_frame->f_lasti += 2; + gen->gi_frame->f_lasti += sizeof(_Py_CODEUNIT); if (_PyGen_FetchStopIterationValue(&val) == 0) { ret = gen_send_ex(gen, val, 0, 0); Py_DECREF(val); |