From 336f74003601a1fb1aa9c492ae5ad5e7c34a961d Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Mon, 16 Jan 2023 11:09:49 -0800
Subject: [PATCH] ircd::m::vm: Fix propagation of faults to evaluator as
 expected by opts mask.

---
 matrix/vm_execute.cc | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/matrix/vm_execute.cc b/matrix/vm_execute.cc
index 76138fdf5..08c35e05e 100644
--- a/matrix/vm_execute.cc
+++ b/matrix/vm_execute.cc
@@ -254,7 +254,7 @@ ircd::m::vm::execute(eval &eval,
 				0UL
 		};
 
-		for(k = 0; k < j; ++k, ++eval.evaluated) try
+		for(k = 0; k < j; ++k, ++eval.evaluated)
 		{
 			const bool exists
 			(
@@ -282,21 +282,6 @@ ircd::m::vm::execute(eval &eval,
 			if(likely(fault == fault::ACCEPT || exists))
 				handle_fault(opts, fault, event.event_id?: eval.event_id, string_view{});
 		}
-		catch(const ctx::interrupted &)
-		{
-			++eval.faulted;
-			throw;
-		}
-		catch(const std::exception &)
-		{
-			++eval.faulted;
-			continue;
-		}
-		catch(...)
-		{
-			++eval.faulted;
-			throw;
-		}
 	}
 
 	return fault::ACCEPT;