Merge branch 'master' of github.com:FuelLabs/sway into vaivaswatha/alloc_intrinsic

Author: vaivaswatha

docs/reference/src/documentation/operations/asset/mint/contract.md

@@ -1,6 +1,6 @@
 # Mint to Contract
 
-We can [`mint`](mint.md) and [`transfer`](../transfer/index.md) the asset to an [`Contract`](../../namespace/contract-id.md).
+We can [`mint`](mint.md) and [`transfer`](../transfer/index.md) the asset to a [`Contract`](../../namespace/contract-id.md).
 
 To use the function we must import it.
 

docs/reference/src/documentation/operations/namespace/contract-id.md

@@ -8,7 +8,7 @@ The `ContractId` type is a struct containing a value of a `b256` type.
 {{#include ../../../code/operations/namespace/src/lib.sw:contract_id}}
 ```
 
-Casting between an `ContractId` and `b256` can be done in the following way:
+Casting between a `ContractId` and `b256` can be done in the following way:
 
 ```sway
 {{#include ../../../code/operations/namespace/src/lib.sw:contract_id_cast}}

docs/reference/src/documentation/operations/storage/libraries/storage-vec.md

@@ -30,7 +30,7 @@ In this example we look at how we can retrieve a single value `balance` and how
 
 Writing to storage is similar to [reading](#reading-from-storage). The difference is that we use a different method `.push(value)` and we use the `read` keyword because the implementation reads the length of the vector to determine where to store the value.
 
-In this example we insert a [tuple](../../../language/built-ins/tuples.md) containing an the [`Identity`](../../namespace/identity.md) of the caller and some `id` into the vector.
+In this example we insert a [tuple](../../../language/built-ins/tuples.md) containing the [`Identity`](../../namespace/identity.md) of the caller and some `id` into the vector.
 
 ```sway
 {{#include ../../../../code/operations/storage/storage_vec/src/main.sw:writing_to_storage}}

sway-ir/src/optimize/constants.rs

@@ -366,7 +366,7 @@ mod tests {
     use crate::{optimize::tests::*, CONST_FOLDING_NAME};
 
     fn assert_operator(t: &str, opcode: &str, l: &str, r: Option<&str>, result: Option<&str>) {
-        let expected = result.map(|result| format!("v0 = const {t} {result}"));
+        let expected = result.map(|result| format!("const {t} {result}"));
         let expected = expected.as_ref().map(|x| vec![x.as_str()]);
         let body = format!(
             "
@@ -495,9 +495,9 @@ mod tests {
                 ret u64 result6, !0
          }",
             Some([
-                "v0 = get_local __ptr u64, LOCAL",
-                "v1 = load v0",
-                "ret u64 v1",
+                "v3v1 = get_local __ptr u64, LOCAL",
+                "v4v1 = load v3v1",
+                "ret u64 v4v1",
             ]),
         );
     }

sway-ir/src/printer.rs

@@ -6,6 +6,7 @@
 
 use std::collections::{BTreeMap, HashMap};
 
+use slotmap::Key;
 use sway_types::SourceEngine;
 
 use crate::{
@@ -1411,7 +1412,7 @@ impl Namer {
 
     fn default_name(&mut self, value: &Value) -> String {
         self.names.get(value).cloned().unwrap_or_else(|| {
-            let new_name = format!("v{}", self.next_value_idx);
+            let new_name = format!("v{:?}", value.0.data());
             self.next_value_idx += 1;
             self.names.insert(*value, new_name.clone());
             new_name

sway-ir/tests/constants/u256_cmp.ir

@@ -1,11 +1,13 @@
+// regex: ID=[[:alpha:]_0-9]+
+
 script {
     fn main() -> bool {
         entry():
         v0 = const u256 0x0000000000000000000000000000000000000000000000000000000000000000
         v1 = const u256 0x0000000000000000000000000000000000000000000000000000000000000001
 
         v10 = cmp eq v0 v0
-//check: v0 = const bool true
+//check: $ID = const bool true
         ret bool v10
     }
 }

sway-ir/tests/constants/u256_ops.ir

@@ -1,3 +1,5 @@
+// regex: ID=[[:alpha:]_0-9]+
+
 script {
     fn main() -> u256 {
         entry():
@@ -22,7 +24,10 @@ script {
         v18 = not v17
         v19 = not v18
         v20 = xor v19, v6
-//check: v0 = const u256 0x0000000000000000000000000000000000000000000000000000000000000002
+// check: entry
+// nextln: $ID = const u256 0x0000000000000000000000000000000000000000000000000000000000000002
+// check-not: const
+// check: ret
         ret u256 v20
     }
 }

sway-ir/tests/cse/cse1.ir

@@ -1,5 +1,5 @@
 // regex: ID=[[:alpha:]0-9]+
-// regex: VAR=v\d+
+// regex: VAR=v\d+v\d+
 
 script {
     fn main() -> bool {

sway-ir/tests/cse/cse2.ir

@@ -1,5 +1,5 @@
 // regex: ID=[[:alpha:]0-9]+
-// regex: VAR=v\d+
+// regex: VAR=v\d+v\d+
 
 script {
     fn main() -> bool {

sway-ir/tests/cse/cse3.ir

@@ -1,5 +1,5 @@
 // regex: ID=[[:alpha:]0-9]+
-// regex: VAR=v\d+
+// regex: VAR=v\d+v\d+
 
 script {
     entry fn main(a: u64, b: u64) -> () {