sim: fix simulation loop when process catches an injected exception.

Author: wanda-phi

amaranth/sim/_pycoro.py

@@ -59,12 +59,23 @@ def run(self):
         self.clear_triggers()
 
         response = None
+        exception = None
         while True:
             try:
-                command = self.coroutine.send(response)
+                if exception is None:
+                    command = self.coroutine.send(response)
+                else:
+                    command = self.coroutine.throw(exception)
+            except StopIteration:
+                self.passive = True
+                self.coroutine = None
+                return
+
+            try:
                 if command is None:
                     command = self.default_cmd
                 response = None
+                exception = None
 
                 if isinstance(command, ValueCastable):
                     command = Value.cast(command)
@@ -118,10 +129,6 @@ def run(self):
                     raise TypeError("Received unsupported command {!r} from process {!r}"
                                     .format(command, self.src_loc()))
 
-            except StopIteration:
-                self.passive = True
-                self.coroutine = None
-                return
-
             except Exception as exn:
-                self.coroutine.throw(exn)
+                response = None
+                exception = exn

tests/test_sim.py

@@ -685,7 +685,6 @@ def process():
                 with self.assertRaisesRegex(TypeError,
                         r"Received unsupported command 1 from process .+?"):
                     yield 1
-                yield Settle()
                 survived = True
             sim.add_process(process)
         self.assertTrue(survived)