kopia lustrzana https://github.com/micropython/micropython
7c1584aef1
When := is used in a comprehension the target variable is bound to the
parent scope, so it's either a global or a nonlocal. Prior to this commit
that was handled by simply using the parent scope's id_info for the
target variable. That's completely wrong because it uses the slot number
for the parent's Python stack to store the variable, rather than the slot
number for the comprehension. This will in most cases lead to incorrect
behaviour or memory faults.
This commit fixes the scoping of the target variable by explicitly
declaring it a global or nonlocal, depending on whether the parent is the
global scope or not. Then the id_info of the comprehension can be used to
access the target variable. This fixes a lot of cases of using := in a
comprehension.
Code size change for this commit:
bare-arm: +0 +0.000%
minimal x86: +0 +0.000%
unix x64: +152 +0.019% standard
stm32: +96 +0.024% PYBV10
cc3200: +96 +0.052%
esp8266: +196 +0.028% GENERIC
esp32: +156 +0.010% GENERIC[incl +8(data)]
mimxrt: +96 +0.027% TEENSY40
renesas-ra: +88 +0.014% RA6M2_EK
nrf: +88 +0.048% pca10040
rp2: +104 +0.020% PICO
samd: +88 +0.033% ADAFRUIT_ITSYBITSY_M4_EXPRESS
Fixes issue #10895.
Signed-off-by: Damien George <damien@micropython.org>
|
||
|---|---|---|
| .. | ||
| argcheck.c | ||
| asmarm.c | ||
| asmarm.h | ||
| asmbase.c | ||
| asmbase.h | ||
| asmthumb.c | ||
| asmthumb.h | ||
| asmx64.c | ||
| asmx64.h | ||
| asmx86.c | ||
| asmx86.h | ||
| asmxtensa.c | ||
| asmxtensa.h | ||
| bc.c | ||
| bc.h | ||
| bc0.h | ||
| binary.c | ||
| binary.h | ||
| builtin.h | ||
| builtinevex.c | ||
| builtinhelp.c | ||
| builtinimport.c | ||
| compile.c | ||
| compile.h | ||
| dynruntime.h | ||
| dynruntime.mk | ||
| emit.h | ||
| emitbc.c | ||
| emitcommon.c | ||
| emitglue.c | ||
| emitglue.h | ||
| emitinlinethumb.c | ||
| emitinlinextensa.c | ||
| emitnarm.c | ||
| emitnative.c | ||
| emitnthumb.c | ||
| emitnx64.c | ||
| emitnx86.c | ||
| emitnxtensa.c | ||
| emitnxtensawin.c | ||
| formatfloat.c | ||
| formatfloat.h | ||
| frozenmod.c | ||
| frozenmod.h | ||
| gc.c | ||
| gc.h | ||
| grammar.h | ||
| lexer.c | ||
| lexer.h | ||
| make_root_pointers.py | ||
| makecompresseddata.py | ||
| makemoduledefs.py | ||
| makeqstrdata.py | ||
| makeqstrdefs.py | ||
| makeversionhdr.py | ||
| malloc.c | ||
| map.c | ||
| misc.h | ||
| mkenv.mk | ||
| mkrules.cmake | ||
| mkrules.mk | ||
| modarray.c | ||
| modbuiltins.c | ||
| modcmath.c | ||
| modcollections.c | ||
| modgc.c | ||
| modio.c | ||
| modmath.c | ||
| modmicropython.c | ||
| modstruct.c | ||
| modsys.c | ||
| modthread.c | ||
| moduerrno.c | ||
| mpconfig.h | ||
| mperrno.h | ||
| mphal.h | ||
| mpprint.c | ||
| mpprint.h | ||
| mpstate.c | ||
| mpstate.h | ||
| mpthread.h | ||
| mpz.c | ||
| mpz.h | ||
| nativeglue.c | ||
| nativeglue.h | ||
| nlr.c | ||
| nlr.h | ||
| nlraarch64.c | ||
| nlrmips.c | ||
| nlrpowerpc.c | ||
| nlrsetjmp.c | ||
| nlrthumb.c | ||
| nlrx64.c | ||
| nlrx86.c | ||
| nlrxtensa.c | ||
| obj.c | ||
| obj.h | ||
| objarray.c | ||
| objarray.h | ||
| objattrtuple.c | ||
| objbool.c | ||
| objboundmeth.c | ||
| objcell.c | ||
| objclosure.c | ||
| objcomplex.c | ||
| objdeque.c | ||
| objdict.c | ||
| objenumerate.c | ||
| objexcept.c | ||
| objexcept.h | ||
| objfilter.c | ||
| objfloat.c | ||
| objfun.c | ||
| objfun.h | ||
| objgenerator.c | ||
| objgenerator.h | ||
| objgetitemiter.c | ||
| objint.c | ||
| objint.h | ||
| objint_longlong.c | ||
| objint_mpz.c | ||
| objlist.c | ||
| objlist.h | ||
| objmap.c | ||
| objmodule.c | ||
| objmodule.h | ||
| objnamedtuple.c | ||
| objnamedtuple.h | ||
| objnone.c | ||
| objobject.c | ||
| objpolyiter.c | ||
| objproperty.c | ||
| objrange.c | ||
| objreversed.c | ||
| objset.c | ||
| objsingleton.c | ||
| objslice.c | ||
| objstr.c | ||
| objstr.h | ||
| objstringio.c | ||
| objstringio.h | ||
| objstrunicode.c | ||
| objtuple.c | ||
| objtuple.h | ||
| objtype.c | ||
| objtype.h | ||
| objzip.c | ||
| opmethods.c | ||
| pairheap.c | ||
| pairheap.h | ||
| parse.c | ||
| parse.h | ||
| parsenum.c | ||
| parsenum.h | ||
| parsenumbase.c | ||
| parsenumbase.h | ||
| persistentcode.c | ||
| persistentcode.h | ||
| profile.c | ||
| profile.h | ||
| py.cmake | ||
| py.mk | ||
| pystack.c | ||
| pystack.h | ||
| qstr.c | ||
| qstr.h | ||
| qstrdefs.h | ||
| reader.c | ||
| reader.h | ||
| repl.c | ||
| repl.h | ||
| ringbuf.c | ||
| ringbuf.h | ||
| runtime.c | ||
| runtime.h | ||
| runtime0.h | ||
| runtime_utils.c | ||
| scheduler.c | ||
| scope.c | ||
| scope.h | ||
| sequence.c | ||
| showbc.c | ||
| smallint.c | ||
| smallint.h | ||
| stackctrl.c | ||
| stackctrl.h | ||
| stream.c | ||
| stream.h | ||
| unicode.c | ||
| unicode.h | ||
| usermod.cmake | ||
| vm.c | ||
| vmentrytable.h | ||
| vstr.c | ||
| warning.c | ||