objgenerator.throw(GeneratorExit) is not equivalent to .close().

.throw() propagates any exceptions, and .close() swallows them. Yielding
in reponse to .throw(GeneratorExit) is still fatal, and we need to
handle it for .throw() case separately (previously it was handled only
for .close() case).

Obscure corner cases due to test_pep380.py.

1 files changed, 3 insertions, 7 deletions

diff --git a/py/objgenerator.c b/py/objgenerator.c
index 5f0f6c3eba..78694c866b 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -134,6 +134,9 @@ STATIC mp_obj_t gen_resume_and_raise(mp_obj_t self_in, mp_obj_t send_value, mp_o
             }
 
         case MP_VM_RETURN_YIELD:
+            if (throw_value != MP_OBJ_NULL && mp_obj_is_subclass_fast(mp_obj_get_type(throw_value), &mp_type_GeneratorExit)) {
+                nlr_jump(mp_obj_new_exception_msg(&mp_type_RuntimeError, "generator ignored GeneratorExit"));
+            }
             return ret;
 
         case MP_VM_RETURN_EXCEPTION:
@@ -171,13 +174,6 @@ STATIC mp_obj_t gen_instance_close(mp_obj_t self_in);
 STATIC mp_obj_t gen_instance_throw(uint n_args, const mp_obj_t *args) {
     mp_obj_t exc = (n_args == 2) ? args[1] : args[2];
     exc = mp_make_raise_obj(exc);
-    if (mp_obj_is_subclass_fast(mp_obj_get_type(exc), &mp_type_GeneratorExit)) {
-        // Throwing GeneratorExit is equivalent of calling close aka
-        // GeneratorExit should be handled specially
-        // TODO: Calling .close() will throw new exception instance, not one
-        // given to throw, which is not ok.
-        return gen_instance_close(args[0]);
-    }
 
     mp_obj_t ret = gen_resume_and_raise(args[0], mp_const_none, exc);
     if (ret == MP_OBJ_NULL) {