StackRduino
diff --git a/‎py/vm.c‎
Lines changed: 6 additions & 0 deletions b/‎py/vm.c‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎tests/basics/gen_yield_from_ducktype.py‎
Lines changed: 22 additions & 0 deletions b/‎tests/basics/gen_yield_from_ducktype.py‎
Lines changed: 22 additions & 0 deletions
@@ -1249,6 +1249,12 @@ unwind_jump:;
                         code_state->ip = ip + ulab; // jump to after for-block
                         code_state->sp -= 1; // pop the exhausted iterator
                         goto outer_dispatch_loop; // continue with dispatch loop
+                    } else if (*code_state->ip == MP_BC_YIELD_FROM) {
+                        // StopIteration inside yield from call means return a value of
+                        // yield from, so inject exception's value as yield from's result
+                        *++code_state->sp = mp_obj_exception_get_value(nlr.ret_val);
+                        code_state->ip++; // yield from is over, move to next instruction
+                        goto outer_dispatch_loop; // continue with dispatch loop
                     }
                 }
             }
 
@@ -42,3 +42,25 @@ def gen3():
 print(next(g))
 print(g.send(5))
 print(g.send(100))
+
+
+#
+# Test proper handling of StopIteration vs other exceptions
+#
+class MyIter:
+    def __iter__(self):
+        return self
+    def __next__(self):
+        raise StopIteration(42)
+
+def gen4():
+    global ret
+    ret = yield from MyIter()
+    1//0
+
+ret = None
+try:
+    print(list(gen4()))
+except ZeroDivisionError:
+    print("ZeroDivisionError")
+print(ret)
Original file line number	Diff line number	Diff line change
`@@ -1249,6 +1249,12 @@ unwind_jump:;`
`1249`	`1249`	`code_state->ip = ip + ulab; // jump to after for-block`
`1250`	`1250`	`code_state->sp -= 1; // pop the exhausted iterator`
`1251`	`1251`	`goto outer_dispatch_loop; // continue with dispatch loop`
	`1252`	`+ } else if (*code_state->ip == MP_BC_YIELD_FROM) {`
	`1253`	`+ // StopIteration inside yield from call means return a value of`
	`1254`	`+ // yield from, so inject exception's value as yield from's result`
	`1255`	`+ *++code_state->sp = mp_obj_exception_get_value(nlr.ret_val);`
	`1256`	`+ code_state->ip++; // yield from is over, move to next instruction`
	`1257`	`+ goto outer_dispatch_loop; // continue with dispatch loop`
`1252`	`1258`	`}`
`1253`	`1259`	`}`
`1254`	`1260`	`}`