Cursor feedback

Author: calintat

third_party/move/move-binary-format/src/file_format.rs

@@ -3060,7 +3060,10 @@ pub enum Bytecode {
         stack >> (error_code: u64)
         abort transaction with error_code and error_message
     "#]
-    #[runtime_check_prologue = "ty_stack >> _"]
+    #[runtime_check_prologue = r#"
+        ty_stack >> _
+        ty_stack >> _
+    "#]
     AbortMsg,
 }
 

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"),
                 }
             };
@@ -969,6 +970,7 @@ impl Generator {
                 ExpData::LoopCont(..)
                     | ExpData::Return(..)
                     | ExpData::Call(_, Operation::Abort, ..)
+                    | ExpData::Call(_, Operation::AbortMsg, ..)
             );
         if needs_break {
             stms.push(ctx.builder.break_(&self.current_loc(ctx), 0))
@@ -1931,6 +1933,7 @@ impl IfElseTransformer<'_> {
                     ExpData::LoopCont(..)
                         | ExpData::Return(..)
                         | ExpData::Call(_, Operation::Abort, _)
+                        | ExpData::Call(_, Operation::AbortMsg, _)
                 )
             })
             .unwrap_or(stmts.len());
@@ -2912,7 +2915,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, _, _)
         )