fix to stop VM on Trap opcode (#163)

noir-lang · Mar 28, 2023 · 59eb20a · 59eb20a
1 parent cb70b7d
commit 59eb20a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/brillig_bytecode/src/lib.rs b/brillig_bytecode/src/lib.rs
@@ -38,7 +38,7 @@ impl VM {
 
     /// Loop over the bytecode and update the program counter
     pub fn process_opcodes(mut self) -> Registers {
-        while self.process_opcode() != VMStatus::Halted {}
+        while !matches!(self.process_opcode(), VMStatus::Halted | VMStatus::Failure) {}
         self.finish()
     }
     // Process a single opcode and modify the program counter

diff --git a/brillig_bytecode/src/opcodes.rs b/brillig_bytecode/src/opcodes.rs
@@ -65,7 +65,7 @@ pub enum Opcode {
         source: RegisterMemIndex,
     },
     /// Used if execution fails during evaluation
-    Trap
+    Trap,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,7 +65,7 @@ pub enum Opcode { @@
             source: RegisterMemIndex,
         },
         /// Used if execution fails during evaluation
-        Trap
+        Trap,
     }
     #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
@@ Expand Down @@