Merge bde6bab into 187146b

sway-core/src/ir_generation/function.rs

@@ -295,25 +295,48 @@ impl<'eng> FnCompiler<'eng> {
         md_mgr: &mut MetadataManager,
         ast_expr: &ty::TyExpression,
     ) -> Result<TerminatorValue, CompileError> {
-        // Compile expression which *may* be a pointer.  We can't return a value so create a
-        // temporary here, store the value and return its pointer.
+        // Compile expression which *may* be a pointer.
         let val =
             return_on_termination_or_extract!(self.compile_expression(context, md_mgr, ast_expr)?);
         let ty = match val.get_type(context) {
             Some(ty) if !ty.is_ptr(context) => ty,
             _ => return Ok(TerminatorValue::new(val, context)),
         };
 
-        // Create a temporary.
-        let temp_name = self.lexical_map.insert_anon();
-        let tmp_var = self
-            .function
-            .new_local_var(context, temp_name, ty, None, false)
-            .map_err(|ir_error| CompileError::InternalOwned(ir_error.to_string(), Span::dummy()))?;
-        let tmp_val = self.current_block.append(context).get_local(tmp_var);
-        self.current_block.append(context).store(tmp_val, val);
+        let is_argument = if let ty::TyExpressionVariant::VariableExpression { name, .. } =
+            &ast_expr.expression
+        {
+            self.function.get_arg(context, name.as_str()).is_some()
+        } else {
+            false
+        };
+
+        let ptr_val = if is_argument {
+            // The `ptr_to_int` instructions gets the address of a variable into an integer.
+            // We then cast it back to a pointer.
+            let ptr_ty = Type::new_ptr(context, ty);
+            let int_ty = Type::get_uint64(context);
+            let ptr_to_int = self.current_block.append(context).ptr_to_int(val, int_ty);
+            let int_to_ptr = self
+                .current_block
+                .append(context)
+                .int_to_ptr(ptr_to_int, ptr_ty);
+            int_to_ptr
+        } else {
+            // We can't return a value so create a temporary here, store the value and return its pointer.
+            let temp_name = self.lexical_map.insert_anon();
+            let tmp_var = self
+                .function
+                .new_local_var(context, temp_name, ty, None, false)
+                .map_err(|ir_error| {
+                    CompileError::InternalOwned(ir_error.to_string(), Span::dummy())
+                })?;
+            let tmp_val = self.current_block.append(context).get_local(tmp_var);
+            self.current_block.append(context).store(tmp_val, val);
+            tmp_val
+        };
 
-        Ok(TerminatorValue::new(tmp_val, context))
+        Ok(TerminatorValue::new(ptr_val, context))
     }
 
     fn compile_string_slice(

sway-ir/src/optimize/inline.rs

@@ -132,15 +132,6 @@ pub fn inline_in_module(
             return true;
         }
 
-        // See https://github.com/FuelLabs/sway/pull/4899
-        if func.args_iter(ctx).any(|(_name, arg_val)| {
-            arg_val.get_type(ctx).map_or(false, |ty| {
-                ty.is_ptr(ctx) || !(ty.is_unit(ctx) | ty.is_bool(ctx) | ty.is_uint(ctx))
-            })
-        }) {
-            return true;
-        }
-
         false
     };
 

sway-ir/src/optimize/memcpyopt.rs

@@ -76,6 +76,14 @@ fn local_copy_prop_prememcpy(context: &mut Context, function: Function) -> Resul
                     instr_info_map.insert(inst, info());
                 }
             }
+            Instruction {
+                op: InstOp::PtrToInt(value, _),
+                ..
+            } => {
+                if let Some(local) = get_symbol(context, *value) {
+                    escaping_uses.insert(local);
+                }
+            }
             Instruction {
                 op: InstOp::AsmBlock(_, args),
                 ..

sway-ir/src/optimize/misc_demotion.rs

@@ -287,9 +287,21 @@ fn ptr_to_int_demotion(context: &mut Context, function: Function) -> Result<bool
         return Ok(false);
     }
 
-    // Take the ptr_to_int value, store it in a temporary local, and replace it with its pointer in
-    // the ptr_to_int instruction.
     for (block, ptr_to_int_instr_val, ptr_val, ptr_ty) in candidates {
+        // If the ptr_val is a load from a memory location, we can just refer to that.
+        if let Some(instr) = ptr_val.get_instruction(context) {
+            if let Some(loaded_val) = match instr.op {
+                InstOp::Load(loaded_val) => Some(loaded_val),
+                _ => None,
+            } {
+                ptr_to_int_instr_val.replace_instruction_value(context, ptr_val, loaded_val);
+                continue;
+            }
+        }
+
+        // Take the ptr_to_int value, store it in a temporary local, and replace it with its pointer in
+        // the ptr_to_int instruction.
+
         // Create a variable for the arg, a get_local for it and a store.
         let loc_var = function.new_unique_local_var(
             context,

sway-ir/tests/demote_misc/demote_ptr_to_int.ir

@@ -1,25 +1,32 @@
 script {
+    fn test(v1: b256) -> u64 {
+        entry(v1: b256):
+        v2 = ptr_to_int v1 to u64
+        ret u64 v2
+    }
     entry fn main() -> u64 {
         local b256 foo = const b256 0x2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
 
         entry():
-        v0 = get_local ptr b256, foo
-        v1 = load v0
-        v2 = ptr_to_int v1 to u64
-        ret u64 v2
+        foo_ptr = get_local ptr b256, foo
+        foo = load foo_ptr
+        v1 = call test(foo)
+        ret u64 v1
     }
 }
 
 // regex: VAL=v\d+
 // regex: ID=[[:alpha:]0-9_]+
 
+// check: fn test($(foo_val=$ID): b256) -> u64
 // check: local b256 $(tmp_loc=$ID)
-// check: local b256 foo = const b256 0x2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
 
-// check: $(foo_ptr=$VAL) = get_local ptr b256, foo
-// check: $(foo_val=$VAL) = load $foo_ptr
 // check: $(tmp_ptr=$VAL) = get_local ptr b256, $tmp_loc
 // check: store $foo_val to $tmp_ptr
 // check: $(tmp_ptr_int=$VAL) = ptr_to_int $tmp_ptr to u64
 // check: ret u64 $tmp_ptr_int
 
+// check: entry fn main() -> u64
+// check: local b256 foo = const b256 0x2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
+// check: $(foo_ptr=$VAL) = get_local ptr b256, foo
+// check: $(foo_val=$VAL) = load $foo_ptr

test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle.json

@@ -7,7 +7,7 @@
         "typeArguments": null
       },
       "name": "C0",
-      "offset": 4476
+      "offset": 4660
     },
     {
       "configurableType": {
@@ -16,7 +16,7 @@
         "typeArguments": null
       },
       "name": "C1",
-      "offset": 4492
+      "offset": 4676
     },
     {
       "configurableType": {
@@ -25,7 +25,7 @@
         "typeArguments": null
       },
       "name": "C2",
-      "offset": 4508
+      "offset": 4692
     },
     {
       "configurableType": {
@@ -34,7 +34,7 @@
         "typeArguments": []
       },
       "name": "C3",
-      "offset": 4540
+      "offset": 4724
     },
     {
       "configurableType": {
@@ -43,7 +43,7 @@
         "typeArguments": []
       },
       "name": "C4",
-      "offset": 4556
+      "offset": 4740
     },
     {
       "configurableType": {
@@ -52,7 +52,7 @@
         "typeArguments": []
       },
       "name": "C5",
-      "offset": 4572
+      "offset": 4756
     },
     {
       "configurableType": {
@@ -61,7 +61,7 @@
         "typeArguments": null
       },
       "name": "C6",
-      "offset": 4588
+      "offset": 4772
     },
     {
       "configurableType": {
@@ -70,7 +70,7 @@
         "typeArguments": null
       },
       "name": "C7",
-      "offset": 4604
+      "offset": 4788
     },
     {
       "configurableType": {
@@ -79,7 +79,7 @@
         "typeArguments": null
       },
       "name": "C7_2",
-      "offset": 4708
+      "offset": 4892
     },
     {
       "configurableType": {
@@ -88,7 +88,7 @@
         "typeArguments": null
       },
       "name": "C9",
-      "offset": 4652
+      "offset": 4836
     }
   ],
   "functions": [

test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_function_parameters/src/main.sw

@@ -108,6 +108,10 @@ fn empty_struct_parameter_not_inlined(p: EmptyStruct) {
 
 #[inline(always)]
 fn struct_parameter(p: S) {
+
+    let r_p_1_addr_of = __addr_of(p);
+    assert(r_p_1_addr_of == __addr_of(p));
+
     let r_p_1 = &p;
     let r_p_2 = &p;
 

test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw

@@ -6,7 +6,7 @@ use std::hash::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x7fae96947a8cad59cc2a25239f9f80897955d4c1b10d31510681f15842b93265;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x53de34b4a064de1a09fb9eb8ed407fd2c3b205c27ad5d8e0c63b28c752a09bbc;
+const CONTRACT_ID = 0x24a37d18be37f911bd7f5e0bfdc887e927cd251f476a49c795d7bdcd46aaef11;
 
 fn main() -> u64 {
     let addr = abi(TestContract, CONTRACT_ID);

test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw

@@ -9,12 +9,12 @@ use test_fuel_coin_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const FUEL_COIN_CONTRACT_ID = 0x27447d931b1c2c0eaf94aa9ffd1c1ea09298ee23a632937accdac91947a502a0;
 #[cfg(experimental_new_encoding = true)]
-const FUEL_COIN_CONTRACT_ID = 0x32dcf3d874415397505a12b60c85c63f4f70eb36a33f984ee81fd8214d4faeeb;
+const FUEL_COIN_CONTRACT_ID = 0xbbe608597ec77080e69360d7913e55f0a1a7b7a35db91f908bd3edc53ef39463;
 
 #[cfg(experimental_new_encoding = false)]
 const BALANCE_CONTRACT_ID = 0x3b8cb681056f61a41e138b8884d7e3bb9332fbd7a8e38e3e0b0ada766cabfa4e;
 #[cfg(experimental_new_encoding = true)]
-const BALANCE_CONTRACT_ID = 0x2d15bdaa30e59eb25bab934e9533d10ace0a971ae942e47119e49ef411978d34;
+const BALANCE_CONTRACT_ID = 0x86ffb8e56ecf97448e14fbf48144073f9f427aaaea6b02215801d87fd2e55109;
 
 fn main() -> bool {
     let default_gas = 1_000_000_000_000;

test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw

@@ -6,7 +6,7 @@ use balance_test_abi::BalanceTest;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x3b8cb681056f61a41e138b8884d7e3bb9332fbd7a8e38e3e0b0ada766cabfa4e;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x2d15bdaa30e59eb25bab934e9533d10ace0a971ae942e47119e49ef411978d34;
+const CONTRACT_ID = 0x86ffb8e56ecf97448e14fbf48144073f9f427aaaea6b02215801d87fd2e55109;
 
 fn main() -> bool {
     let balance_test_contract = abi(BalanceTest, CONTRACT_ID);

test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_abi_with_tuples/src/main.sw

@@ -5,7 +5,7 @@ use abi_with_tuples::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xb351aff8258ce46d16a71be666dd2b0b09d72243105c51f4423765824e59cac9;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xde6ab165b5b0f9058daf26002d22f472e6d1af1c35e0210821e743d297d55b17;
+const CONTRACT_ID = 0x59389df6ee02b88036a7fe09e90bd7c0d748742571d06b05f8fa7dc6b916d02e;
 
 fn main() -> bool {
     let the_abi = abi(MyContract, CONTRACT_ID);

test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw

@@ -2,9 +2,9 @@ script;
 use basic_storage_abi::{BasicStorage, Quad};
 
 #[cfg(experimental_new_encoding = false)]
-const CONTRACT_ID = 0xa75e1629f14cf3fa28c6fc442d2a2470cbeb966ee53574935ee4fe28bd24dcb1;
+const CONTRACT_ID = 0xd3d29e03b6c4726021998b43e0a96e1b40208062cbd7893ac5737fd1e0d7b59e;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x089ad9c09f74d319c4dd17ce8ac1ee2d41d7bb348831eb0b7438f09f82da4204;
+const CONTRACT_ID = 0x0d2776963fb31f8e26e001ab5a59377af44c7429091cc81d8d44fdba6916a128;
 
 fn main() -> u64 {
     let addr = abi(BasicStorage, CONTRACT_ID);

test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw

@@ -5,7 +5,7 @@ use contract_with_type_aliases_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x9d76ecbf446c30ef659efd1157d67d156de02b1e6c2ac2f9c744125571efa229;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xdf7ff45bea6a49aa2b6ba9f12eac13dafa349b9c57cd8f7d4892bb0ebcc3782a;
+const CONTRACT_ID = 0x184999244673fff604c290a47715382c1f9b5e057bb8e9f5469e6d7840798d6d;
 
 fn main() {
     let caller = abi(MyContract, CONTRACT_ID);

test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/src/main.sw

@@ -6,7 +6,7 @@ use dynamic_contract_call::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xb7a555aa47aaa778e0b1c351e897e83b08b34a1599114166bb5635721da0ab14;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x3c1b3e3ad4debae2393ff81b5d77260c62f1356daa51c67ff220a09e7838a52a;
+const CONTRACT_ID = 0xf241f685b4c231fa894c4b1c7ad75882d8b0d8292249e7d1e640b001ea15fb49;
 
 fn main() -> bool {
     let the_abi = abi(Incrementor, CONTRACT_ID);

test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_storage_enum/src/main.sw

@@ -3,9 +3,9 @@ script;
 use storage_enum_abi::*;
 
 #[cfg(experimental_new_encoding = false)]
-const CONTRACT_ID = 0x10ac00a805f5d051274a250b79047439e9df9c6c5626e0b4cecddc93e45e6ca3;
+const CONTRACT_ID = 0xb39368a42dec58dabead50a7c97953d3a49fcf35d63a80378240d36538c99745;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xc1d94591f6ea13e0a666939f12afab7a5db992559328032a8029c2c048d56632;
+const CONTRACT_ID = 0x18625bd7d24adb1da41be8bd4a51c15d8657ff66d37b3d7086601cddb2e7e100;
 
 fn main() -> u64 {
     let caller = abi(StorageEnum, CONTRACT_ID);

test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw

@@ -5,7 +5,7 @@ use auth_testing_abi::AuthTesting;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xd7ef57c654a7e52ee8b85f34c64fa2f8e1a250eceb446cfe9805b175a0a7680f;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xe11b1032f7669c45109c1bcfade9aa7fb3e480634c8a05f6a45d36434d2edbbf;
+const CONTRACT_ID = 0x4dd3ebb0bc125babe6e4d19f96419fb153c94698f4c3360ebd37af796823f9a2;
 
 // should be false in the case of a script
 fn main() -> bool {

test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw

@@ -7,7 +7,7 @@ use context_testing_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xe83ed45906627117f00f60e47140c6100b4b69133389a2dafd35bc3282329385;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x3a0ad97b880a8e5f127e19eb5a05ed1b252a29b0367e5051df8ecf57d6fd234f;
+const CONTRACT_ID = 0xe6214f7e5b449d2d0e9a1625db4ed9a597852dc0c77484c856d862685cc25dcf;
 
 fn main() -> bool {
     let gas: u64 = u64::max();

test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/nested_struct_args_caller/src/main.sw

@@ -5,7 +5,7 @@ use nested_struct_args_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xc615be7b48402210cbec3bc1667ab5a8093d449d5d8d1fdcc26e6f18e7942ea9;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xcfc9c8eb2bacbf90c13ced943f843264be07ed82029779345a83e1c9e686d334;
+const CONTRACT_ID = 0x5bce4f1adc3cfc44f95e514764fe4b51c648236d1bc82ac0dc8d0579f713a7db;
 
 fn main() -> bool {
     let caller = abi(NestedStructArgs, CONTRACT_ID);

test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/storage_access_caller/src/main.sw

@@ -6,7 +6,7 @@ use std::hash::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xb0eee35cb9c3e2da8b5be0435192ea915d0e0dba2876528424af7bbb31574648;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x69100d93fdb5870d073083e86f8b8705f584d14956c3c88a5c1697a962437d1d;
+const CONTRACT_ID = 0x6d64654a53e9b3bc9fdbebcb3d115414958ef041d74aa33651e8f90a7fc6ffd5;
 
 fn main() -> bool {
     let caller = abi(StorageAccess, CONTRACT_ID);

test/src/ir_generation/tests/simple_contract_call.sw

@@ -46,8 +46,10 @@ fn main() -> u64 {
 // check: local b256 $(big_fives_const=$ID) = const b256 0x5555555555555555555555555555555555555555555555555555555555555555
 // check: local b256 $(contract_id_2_const=$ID) = const b256 0x0c1c50c2bf5ba4bb351b4249a2f5e7d86556fcb4a6ae90465ff6c86126eeb3c0
 // check: local b256 $(asset_id_2_const=$ID) = const b256 0x0000000000000000000000000000000000000000000000000000000000000000
+// check: local b256 $(arg_for_get_b256=$ID)
 
 // check: $(contract_id_0_ptr=$VAL) = get_local ptr b256, $contract_id_0_const
+// check: $(threes_const_ptr=$VAL) = get_local ptr b256, $threes_const
 // check: $(contract_id_1_ptr=$VAL) = get_local ptr b256, $contract_id_1_const
 // check: $(big_fives_ptr=$VAL) = get_local ptr b256, $big_fives_const
 // check: $(contract_id_2_ptr=$VAL) = get_local ptr b256, $contract_id_2_const
@@ -77,7 +79,8 @@ fn main() -> u64 {
 // check: $(call_res=$VAL) = contract_call u64 get_u64 $args_ptr, $coins, $asset_id_ptr, $gas
 
 // --- call get_b256() ---
-// check: $(user_arg_ptr=$VAL) = get_local ptr b256, $threes_const
+// check: $(user_arg_ptr=$VAL) = get_local ptr b256, $arg_for_get_b256
+// check: mem_copy_val $user_arg_ptr, $threes_const_ptr
 // check: $(user_arg=$VAL) = ptr_to_int $user_arg_ptr to u64
 
 // check: $(args_ptr=$VAL) = get_local ptr { b256, u64, u64 }, $ID