fixup! Implement IR support

Author: runtian-zhou

language/move-binary-format/src/deserializer.rs

@@ -1855,6 +1855,9 @@ impl Opcodes {
             0x4B => Ok(Opcodes::CAST_U16),
             0x4C => Ok(Opcodes::CAST_U32),
             0x4D => Ok(Opcodes::CAST_U256),
+            0x4E => Ok(Opcodes::GET_FUNC_PTR),
+            0x4F => Ok(Opcodes::GET_FUNC_PTR_GENERIC),
+            0x50 => Ok(Opcodes::CALL_FUNC_PTR),
             _ => Err(PartialVMError::new(StatusCode::UNKNOWN_OPCODE)),
         }
     }

language/move-bytecode-verifier/src/signature.rs

@@ -356,8 +356,10 @@ impl<'a> SignatureChecker<'a> {
             }
             Vector(ty) => self.check_signature_token(ty),
             StructInstantiation(_, type_arguments) => self.check_signature_tokens(type_arguments),
-            Function(_) => Err(PartialVMError::new(StatusCode::INVALID_SIGNATURE_TOKEN)
-                .with_message("function not allowed".to_string())),
+            Function(func_ty) => {
+                func_ty.parameters.iter().map(|ty| self.check_signature_token(ty)).collect::<PartialVMResult<()>>()?;
+                func_ty.return_.iter().map(|ty| self.check_signature_token(ty)).collect::<PartialVMResult<()>>()
+            }
         }
     }
 

language/move-bytecode-verifier/src/stack_usage_verifier.rs

@@ -272,7 +272,7 @@ impl<'a> StackUsageVerifier<'a> {
             Bytecode::GetFunctionPointer(_) | Bytecode::GetFunctionPointerGeneric(_) => (0, 1),
             Bytecode::CallFunctionPointer(idx) => match &self.resolver.signature_at(*idx).0[0] {
                 SignatureToken::Function(func_ty) => (
-                    func_ty.parameters.len() as u64,
+                    func_ty.parameters.len() as u64 + 1,
                     func_ty.return_.len() as u64,
                 ),
                 _ => {

language/move-vm/transactional-tests/tests/function_pointers/simple_get_and_call.exp

@@ -0,0 +1 @@
+processed 2 tasks

language/move-vm/transactional-tests/tests/function_pointers/simple_get_and_call.mvir

@@ -16,6 +16,7 @@ main() {
     let a: u64;
 label b0:
     func = get_function_pointer(M.sum);
-    a = call_function_pointer<|u64, u64| (u64)>(move(func), 0, 1);
+    a = call_function_pointer<|u64, u64| (u64)>(0, 1, move(func));
     assert(move(a) == 1, 0);
+    return;
 }