avmc_queue,reference,fwd: Unify exception handling

lhmouse · Oct 22, 2023 · 169f32f · 169f32f
1 parent e046084
commit 169f32f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 25 deletions.
diff --git a/asteria/fwd.cpp b/asteria/fwd.cpp
@@ -61,17 +61,14 @@ invoke_ptc_aware(Reference& self, Global_Context& global, Reference_Stack&& stac
       if(auto ptr = this->m_sptr.get())
         return ptr->invoke_ptc_aware(self, global, ::std::move(stack));  // dynamic
     }
+    catch(Runtime_Error& except) {
+      // Forward the exception.
+      throw;
+    }
     catch(exception& stdex) {
-      auto known = dynamic_cast<Runtime_Error*>(&stdex);
-      if(known) {
-        // Forward the exception.
-        throw;
-      }
-      else {
-        // Replace the active exception.
-        Runtime_Error except(Runtime_Error::M_format(), "$1", stdex);
-        throw except;
-      }
+      // Replace the active exception.
+      Runtime_Error except(Runtime_Error::M_format(), "$1", stdex);
+      throw except;
     }
 
     throw Runtime_Error(Runtime_Error::M_format(),

diff --git a/asteria/llds/avmc_queue.cpp b/asteria/llds/avmc_queue.cpp
@@ -178,19 +178,16 @@ execute(Executive_Context& ctx) const
             status = qnode->pv_meta->exec(ctx, qnode);
             break;
           }
+          catch(Runtime_Error& except) {
+            // Modify the exception in place and rethrow it without copying it.
+            except.push_frame_plain(qnode->pv_meta->sloc);
+            throw;
+          }
           catch(exception& stdex) {
-            auto known = dynamic_cast<Runtime_Error*>(&stdex);
-            if(known) {
-              // Modify the exception in place and rethrow it without copying it.
-              known->push_frame_plain(qnode->pv_meta->sloc);
-              throw;
-            }
-            else {
-              // Replace the active exception.
-              Runtime_Error except(Runtime_Error::M_format(), "$1", stdex);
-              except.push_frame_plain(qnode->pv_meta->sloc);
-              throw except;
-            }
+            // Replace the active exception.
+            Runtime_Error except(Runtime_Error::M_format(), "$1", stdex);
+            except.push_frame_plain(qnode->pv_meta->sloc);
+            throw except;
           }
       }
 

diff --git a/asteria/runtime/air_node.cpp b/asteria/runtime/air_node.cpp
@@ -1199,9 +1199,8 @@ solidify(AVMC_Queue& queue) const
               return status;
             }
             else
-              throw Runtime_Error(Runtime_Error::M_throw(),
-                        format_string("Range value not iterable (value `$1`)", range),
-                        sp.sloc_init);
+              throw Runtime_Error(Runtime_Error::M_assert(), sp.sloc_init,
+                        format_string("Range value not iterable (value `$1`)", range));
           }
 
           // Uparam