[copybara] Sync recent changes from aptos-core

language/evm/move-to-yul/src/context.rs

@@ -225,7 +225,7 @@ impl<'a> Context<'a> {
         pipeline.add_processor(ReachingDefProcessor::new());
         pipeline.add_processor(LiveVarAnalysisProcessor::new());
         if options.dump_bytecode {
-            pipeline.run_with_dump(env, &mut targets, &options.output, false, &|_| {})
+            pipeline.run_with_dump(env, &mut targets, &options.output, false, &|_| {}, || true)
         } else {
             pipeline.run(env, &mut targets);
         }
@@ -784,7 +784,7 @@ impl<'a> Context<'a> {
             Tuple(_)
             | TypeParameter(_)
             | Reference(_, _)
-            | Fun(_, _)
+            | Fun(..)
             | TypeDomain(_)
             | ResourceDomain(_, _, _)
             | Error

language/evm/move-to-yul/src/dispatcher_generator.rs

@@ -67,7 +67,7 @@ impl Generator {
     ) {
         emitln!(ctx.writer, "if iszero(lt(calldatasize(), 4))");
         let mut selectors = BTreeMap::new();
-        let para_vec = vec!["calldataload(0)".to_string(), "224".to_string()];
+        let para_vec = ["calldataload(0)".to_string(), "224".to_string()];
         let shr224 = self.call_builtin_str(ctx, YulFunction::Shr, para_vec.iter().cloned());
         ctx.emit_block(|| {
             emitln!(ctx.writer, "let selector := {}", shr224);
@@ -528,7 +528,7 @@ impl Generator {
                     .enumerate()
                 {
                     let is_static = ty.is_static();
-                    let local_typ_var = vec![ret_var[stack_pos].clone()];
+                    let local_typ_var = [ret_var[stack_pos].clone()];
                     let abi_decode_type =
                         gen.generate_abi_decoding_type(ctx, ty, move_ty, from_memory);
                     ctx.emit_block(|| {
@@ -631,7 +631,7 @@ impl Generator {
                 {
                     let is_static = ty.is_static();
                     // TODO: consider the case size_on_stack is not 1
-                    let local_typ_var = vec![ret_var[stack_pos].clone()];
+                    let local_typ_var = [ret_var[stack_pos].clone()];
                     let abi_decode_type =
                         gen.generate_abi_decoding_type(ctx, ty, move_ty, from_memory);
                     ctx.emit_block(|| {
@@ -1453,7 +1453,7 @@ impl Generator {
                     .enumerate()
                 {
                     let is_static = ty.is_static();
-                    let local_typ_var = vec![ret_var[stack_pos].clone()];
+                    let local_typ_var = [ret_var[stack_pos].clone()];
                     let memory_func = ctx.memory_load_builtin_fun(move_ty);
                     if local_typ_var.len() == 1 {
                         emitln!(

language/evm/move-to-yul/src/external_functions.rs

@@ -122,7 +122,7 @@ impl NativeFunctions {
             let fun_sig = format!("{}", sig);
             let function_selector =
                 format!("0x{:x}", Keccak256::digest(fun_sig.as_bytes()))[..10].to_string();
-            let para_vec = vec![function_selector, "224".to_string()];
+            let para_vec = [function_selector, "224".to_string()];
             let shl224 =
                 gen.parent
                     .call_builtin_str(ctx, YulFunction::Shl, para_vec.iter().cloned());

language/evm/move-to-yul/src/functions.rs

@@ -548,10 +548,17 @@ impl<'a> FunctionGenerator<'a> {
 
                     // Unimplemented
                     Vector => unimplemented!("vector"),
+                    TestVariant(..)
+                    | PackVariant(..)
+                    | UnpackVariant(..)
+                    | BorrowVariantField(..) => {
+                        unimplemented!("variants")
+                    },
 
                     // Specification or other operations which can be ignored here
                     Release
                     | GetField(_, _, _, _)
+                    | GetVariantField(_, _, _, _, _)
                     | GetGlobal(_, _, _)
                     | IsParent(_, _)
                     | WriteBack(_, _)

language/evm/move-to-yul/src/lib.rs

@@ -51,14 +51,15 @@ pub fn run_to_yul_errors_to_stderr(options: Options) -> anyhow::Result<()> {
 pub fn run_to_yul<W: WriteColor>(error_writer: &mut W, mut options: Options) -> anyhow::Result<()> {
     // Run the model builder.
     let addrs = parse_addresses_from_options(options.named_address_mapping.clone())?;
-    let flags = Flags::empty().set_flavor("async");
+    let flags = Flags::empty().set_flavor("evm");
     let known_attributes = get_known_attributes_for_flavor(&flags);
     let env = run_model_builder_with_options_and_compilation_flags(
         vec![PackagePaths {
             name: None,
             paths: options.sources.clone(),
             named_address_map: addrs.clone(),
         }],
+        vec![],
         vec![PackagePaths {
             name: None,
             paths: options.dependencies.clone(),
@@ -107,14 +108,15 @@ pub fn run_to_abi_metadata<W: WriteColor>(
 ) -> anyhow::Result<Vec<Metadata>> {
     // Run the model builder.
     let addrs = parse_addresses_from_options(options.named_address_mapping.clone())?;
-    let flags = Flags::empty().set_flavor("async");
+    let flags = Flags::empty().set_flavor("evm");
     let known_attributes = get_known_attributes_for_flavor(&flags);
     let env = run_model_builder_with_options_and_compilation_flags(
         vec![PackagePaths {
             name: None,
             paths: options.sources.clone(),
             named_address_map: addrs.clone(),
         }],
+        vec![],
         vec![PackagePaths {
             name: None,
             paths: options.dependencies.clone(),

language/evm/move-to-yul/src/solidity_ty.rs

@@ -368,7 +368,7 @@ impl SolidityType {
             },
             TypeParameter(_)
             | Reference(_, _)
-            | Fun(_, _)
+            | Fun(..)
             | TypeDomain(_)
             | ResourceDomain(_, _, _)
             | Error