From 9ed5e80eea71c8392b7c178d2e2b69e2428850d8 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Tue, 4 Jul 2017 02:14:25 +1000
Subject: [PATCH] py/vm: Make "if" control flow more obvious in YIELD_FROM
 opcode.

---
 py/vm.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/py/vm.c b/py/vm.c
index 404c799123..7451d53b91 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -1159,8 +1159,7 @@ yield:
                         ip--;
                         PUSH(ret_value);
                         goto yield;
-                    }
-                    if (ret_kind == MP_VM_RETURN_NORMAL) {
+                    } else if (ret_kind == MP_VM_RETURN_NORMAL) {
                         // Pop exhausted gen
                         sp--;
                         // TODO: When ret_value can be MP_OBJ_NULL here??
@@ -1176,8 +1175,8 @@ yield:
                         // if it was swallowed, we re-raise GeneratorExit
                         GENERATOR_EXIT_IF_NEEDED(t_exc);
                         DISPATCH();
-                    }
-                    if (ret_kind == MP_VM_RETURN_EXCEPTION) {
+                    } else {
+                        assert(ret_kind == MP_VM_RETURN_EXCEPTION);
                         // Pop exhausted gen
                         sp--;
                         if (EXC_MATCH(ret_value, MP_OBJ_FROM_PTR(&mp_type_StopIteration))) {