Merge branch 'master' into de-monomorph-cache

sway-core/src/asm_generation/from_ir.rs

@@ -1162,7 +1162,7 @@ impl<'ir> AsmBuilder<'ir> {
         let index_reg = self.value_to_register(index);
         self.bytecode.push(Op {
             opcode: either::Either::Left(VirtualOp::GTF(
-                instr_reg,
+                instr_reg.clone(),
                 index_reg,
                 VirtualImmediate12 {
                     value: tx_field_id as u16,
@@ -1171,6 +1171,7 @@ impl<'ir> AsmBuilder<'ir> {
             comment: "get transaction field".into(),
             owning_span: self.md_mgr.val_to_span(self.context, *instr_val),
         });
+        self.reg_map.insert(*instr_val, instr_reg);
     }
 
     fn compile_insert_element(

sway-core/src/semantic_analysis/ast_node/mod.rs

@@ -474,19 +474,24 @@ impl TypedAstNode {
         };
 
         if let TypedAstNode {
-            content: TypedAstNodeContent::Expression(TypedExpression { .. }),
+            content: TypedAstNodeContent::Expression(TypedExpression { ref expression, .. }),
             ..
         } = node
         {
-            let warning = Warning::UnusedReturnValue {
-                r#type: Box::new(node.type_info()),
-            };
-            assert_or_warn!(
-                node.type_info().is_unit() || node.type_info() == TypeInfo::ErrorRecovery,
-                warnings,
-                node.span.clone(),
-                warning
-            );
+            if !matches!(
+                expression,
+                TypedExpressionVariant::Break | TypedExpressionVariant::Continue,
+            ) {
+                let warning = Warning::UnusedReturnValue {
+                    r#type: Box::new(node.type_info()),
+                };
+                assert_or_warn!(
+                    node.type_info().is_unit() || node.type_info() == TypeInfo::ErrorRecovery,
+                    warnings,
+                    node.span.clone(),
+                    warning
+                );
+            }
         }
 
         ok(node, warnings, errors)

sway-core/tests/ir_to_asm/gtf.asm

@@ -0,0 +1,11 @@
+.program:
+ji   i4
+noop
+DATA_SECTION_OFFSET[0..32]
+DATA_SECTION_OFFSET[32..64]
+lw   $ds $is 1
+add  $$ds $$ds $is
+gtf  $r0 $zero i1             ; get transaction field
+ret  $r0
+noop                          ; word-alignment of data section
+.data:

sway-core/tests/ir_to_asm/gtf.ir

@@ -0,0 +1,8 @@
+script {
+    fn main() -> u64 {
+        entry:
+        v0 = const u64 0
+        v1 = gtf v0, 1
+        ret u64 v1
+    }
+}

test/src/e2e_vm_tests/test_programs/should_fail/illegal_break/test.toml

@@ -1,9 +1,5 @@
 category = "fail"
 
-# check: $()fn main() {
-# nextln: $()break;
-# nextln: $()not assigned to anything
-
 # check: $()This code is unreachable
 
 # check: $()fn main() {

test/src/e2e_vm_tests/test_programs/should_fail/illegal_continue/test.toml

@@ -1,11 +1,7 @@
 category = "fail"
 
-# check: $()fn main() {
-# nextln: $()continue;
-# nextln: $()not assigned to anything
-
 # check: $()This code is unreachable
 
 # check: $()fn main() {
 # nextln: $()continue;
-# nextln: $()"continue" used outside of a loop
+# nextln: $()"continue" used outside of a loop

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

@@ -6,9 +6,10 @@
       {
         "components": null,
         "name": "",
-        "type": "bool"
+        "type": "bool",
+        "typeArguments": null
       }
     ],
     "type": "function"
   }
-]
+]

test/src/e2e_vm_tests/test_programs/should_pass/language/binary_and_hex_literals/test.toml

@@ -1 +1,3 @@
-category = "disabled"
+category = "run"
+expected_result = { action = "return", value = 1 }
+validate_abi = true

test/src/e2e_vm_tests/test_programs/should_pass/language/break_and_continue_block_ret/Forc.lock

@@ -0,0 +1,4 @@
+[[package]]
+name = 'break_and_continue_block_ret'
+source = 'root'
+dependencies = []

test/src/e2e_vm_tests/test_programs/should_pass/language/break_and_continue_block_ret/Forc.toml

@@ -0,0 +1,6 @@
+[project]
+authors = ["Fuel Labs <[email protected]>"]
+entry = "main.sw"
+license = "Apache-2.0"
+name = "break_and_continue_block_ret"
+implicit-std = false

test/src/e2e_vm_tests/test_programs/should_pass/language/break_and_continue_block_ret/src/main.sw

@@ -0,0 +1,15 @@
+script;
+
+fn main() {
+    while true {
+        if true {
+            break;
+        }
+    }
+
+    while true {
+        if true {
+            continue;
+        }
+    }
+}

test/src/e2e_vm_tests/test_programs/should_pass/language/break_and_continue_block_ret/test.toml

@@ -0,0 +1,3 @@
+category = "compile"
+
+# not: $()This returns a value of type unknown, which is not assigned to anything and is ignored.