Cursor feedback

Author: calintat

third_party/move/move-model/bytecode/src/astifier.rs

@@ -614,9 +614,10 @@ impl Generator {
                 match ctx.code_for_block(blk).last() {
                     None => 0,
                     Some(Abort(..)) => 1,
-                    Some(Jump(..)) => 2,
-                    Some(Branch(..)) => 3,
-                    Some(Ret(..)) => 4,
+                    Some(AbortMsg(..)) => 2,
+                    Some(Jump(..)) => 3,
+                    Some(Branch(..)) => 4,
+                    Some(Ret(..)) => 5,
                     _ => panic!("unexpected block terminator"),
                 }
             };
@@ -1931,6 +1932,7 @@ impl IfElseTransformer<'_> {
                     ExpData::LoopCont(..)
                         | ExpData::Return(..)
                         | ExpData::Call(_, Operation::Abort, _)
+                        | ExpData::Call(_, Operation::AbortMsg, _)
                 )
             })
             .unwrap_or(stmts.len());
@@ -2912,7 +2914,10 @@ where
     fn is_terminator(&self, exp: &ExpData) -> bool {
         matches!(
             exp,
-            ExpData::LoopCont(..) | ExpData::Return(..) | ExpData::Call(_, Operation::Abort, ..)
+            ExpData::LoopCont(..)
+                | ExpData::Return(..)
+                | ExpData::Call(_, Operation::Abort, ..)
+                | ExpData::Call(_, Operation::AbortMsg, ..)
         )
     }
 

third_party/move/move-model/bytecode/src/stackless_bytecode.rs

@@ -561,7 +561,10 @@ impl Bytecode {
     pub fn is_exit(&self) -> bool {
         matches!(
             self,
-            Bytecode::Ret(..) | Bytecode::Abort(..) | Bytecode::Call(_, _, Operation::Stop, _, _)
+            Bytecode::Ret(..)
+                | Bytecode::Abort(..)
+                | Bytecode::AbortMsg(..)
+                | Bytecode::Call(_, _, Operation::Stop, _, _)
         )
     }
 
@@ -575,6 +578,7 @@ impl Bytecode {
             Bytecode::Ret(..)
                 | Bytecode::Jump(..)
                 | Bytecode::Abort(..)
+                | Bytecode::AbortMsg(..)
                 | Bytecode::Branch(..)
                 | Bytecode::Call(_, _, Operation::Stop, _, _)
         )