Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions mypyc/irbuild/generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,12 @@ def setup_generator_class(builder: IRBuilder) -> ClassIR:
builder.fn_info.env_class = generator_class_ir
else:
generator_class_ir.attributes[ENV_ATTR_NAME] = RInstance(builder.fn_info.env_class)
if not builder.fn_info.fitem.is_coroutine:
# After completion generators still need generator.__mypyc_env__ for subsequent
# __next__() calls to observe the terminal next-label and raise StopIteration.
# Coroutines can't be resumed after completion, so keeping the environment alive
# there would just extend local lifetimes unnecessarily.
generator_class_ir.attrs_to_keep_alive_on_completion.add(ENV_ATTR_NAME)

builder.classes.append(generator_class_ir)
return generator_class_ir
Expand Down
17 changes: 16 additions & 1 deletion mypyc/test-data/run-generators.test
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Test cases for generators and yield (compile and run)

[case testYield]
from typing import Generator, Iterable, Union, Tuple, Dict
from typing import Callable, Dict, Generator, Iterable, Iterator, Tuple, Union

def yield_three_times() -> Iterable[int]:
yield 1
Expand Down Expand Up @@ -87,6 +87,19 @@ def return_tuple() -> Generator[int, None, Tuple[int, int]]:
yield 0
return 1, 2

def call_lambda(fn: Callable[[], None]) -> None:
fn()

def get_iterator() -> Iterator[str]:
call_lambda(lambda: None)
yield ""

def yield_twice_via_generator_reuse() -> Iterator[str]:
identified_imports = get_iterator()
yield from identified_imports
for identified_import in identified_imports:
yield identified_import

[file driver.py]
from native import (
yield_three_times,
Expand All @@ -99,6 +112,7 @@ from native import (
A,
return_tuple,
yield_dict_methods,
yield_twice_via_generator_reuse,
)
from testutil import run_generator
from collections import defaultdict
Expand All @@ -114,6 +128,7 @@ assert run_generator(A(0).generator()) == ((0,), None)
assert run_generator(return_tuple()) == ((0,), (1, 2))
assert run_generator(yield_dict_methods({}, {}, {})) == ((), None)
assert run_generator(yield_dict_methods({1: 2}, {3: 4}, {5: 6})) == ((1, 3, 4, 6), None)
assert run_generator(yield_twice_via_generator_reuse()) == (("",), None)
dd = defaultdict(int, {0: 1})
assert run_generator(yield_dict_methods(dd, dd, dd)) == ((0, 0, 1, 1), None)

Expand Down
Loading