py/compile: Fix async for's stack handling of iterator expression.

Prior to this fix, async for assumed the iterator expression was a simple
identifier, and used that identifier as a local to store the intermediate
iterator object.  This is incorrect behaviour.

This commit fixes the issue by keeping the iterator object on the stack as
an anonymous local variable.

Fixes issue #11511.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George
2023-05-19 17:00:53 +10:00
parent 14c2b64131
commit 606ec9bfb1
3 changed files with 120 additions and 18 deletions

View File

@@ -1,29 +1,75 @@
# test basic async for execution
# example taken from PEP0492
class AsyncIteratorWrapper:
def __init__(self, obj):
print('init')
self._it = iter(obj)
print("init")
self._obj = obj
def __repr__(self):
return "AsyncIteratorWrapper-" + self._obj
def __aiter__(self):
print('aiter')
return self
print("aiter")
return AsyncIteratorWrapperIterator(self._obj)
class AsyncIteratorWrapperIterator:
def __init__(self, obj):
print("init")
self._it = iter(obj)
async def __anext__(self):
print('anext')
print("anext")
try:
value = next(self._it)
except StopIteration:
raise StopAsyncIteration
return value
async def coro():
async for letter in AsyncIteratorWrapper('abc'):
def run_coro(c):
print("== start ==")
try:
c.send(None)
except StopIteration:
print("== finish ==")
async def coro0():
async for letter in AsyncIteratorWrapper("abc"):
print(letter)
o = coro()
try:
o.send(None)
except StopIteration:
print('finished')
run_coro(coro0())
async def coro1():
a = AsyncIteratorWrapper("def")
async for letter in a:
print(letter)
print(a)
run_coro(coro1())
a_global = AsyncIteratorWrapper("ghi")
async def coro2():
async for letter in a_global:
print(letter)
print(a_global)
run_coro(coro2())
async def coro3(a):
async for letter in a:
print(letter)
print(a)
run_coro(coro3(AsyncIteratorWrapper("jkl")))

View File

@@ -1,5 +1,7 @@
== start ==
init
aiter
init
anext
a
anext
@@ -7,4 +9,43 @@ b
anext
c
anext
finished
== finish ==
== start ==
init
aiter
init
anext
d
anext
e
anext
f
anext
AsyncIteratorWrapper-def
== finish ==
init
== start ==
aiter
init
anext
g
anext
h
anext
i
anext
AsyncIteratorWrapper-ghi
== finish ==
init
== start ==
aiter
init
anext
j
anext
k
anext
l
anext
AsyncIteratorWrapper-jkl
== finish ==