Merge branch 'master' into IGI-111/verif

sway-core/src/ir_generation/function.rs

@@ -3975,15 +3975,30 @@ impl<'eng> FnCompiler<'eng> {
         if field_tys.len() != 1 && contents.is_some() {
             // Insert the value too.
             // Only store if the value does not diverge.
+            let contents_expr = contents.unwrap();
             let contents_value = return_on_termination_or_extract!(
-                self.compile_expression_to_value(context, md_mgr, contents.unwrap())?
+                self.compile_expression_to_value(context, md_mgr, contents_expr)?
             );
             let contents_type = contents_value.get_type(context).ok_or_else(|| {
                 CompileError::Internal(
                     "Unable to get type for enum contents.",
                     enum_decl.span.clone(),
                 )
             })?;
+
+            let variant_type = field_tys[1].get_field_type(context, tag as u64).unwrap();
+            if contents_type != variant_type {
+                return Err(CompileError::Internal(
+                    format!(
+                        "Expression type \"{}\" and Variant type \"{}\" do not match",
+                        contents_type.as_string(context),
+                        variant_type.as_string(context)
+                    )
+                    .leak(),
+                    contents_expr.span.clone(),
+                ));
+            }
+
             let gep_val = self
                 .current_block
                 .append(context)

sway-core/src/semantic_analysis/ast_node/expression/typed_expression/method_application.rs

@@ -52,7 +52,17 @@ pub(crate) fn type_check_method_application(
         let arg_handler = Handler::default();
         let arg_opt = ty::TyExpression::type_check(&arg_handler, ctx, arg).ok();
 
-        let needs_second_pass = arg_handler.has_errors();
+        let has_errors = arg_handler.has_errors();
+        let has_numerics = arg_opt
+            .as_ref()
+            .map(|x| {
+                x.return_type
+                    .extract_inner_types(engines, IncludeSelf::Yes)
+                    .iter()
+                    .any(|x| matches!(&*engines.te().get(*x), TypeInfo::Numeric))
+            })
+            .unwrap_or_default();
+        let needs_second_pass = has_errors || has_numerics;
 
         if index == 0 {
             // We want to emit errors in the self parameter and ignore TraitConstraintNotSatisfied with Placeholder

sway-lib-std/src/bytes.sw

@@ -927,27 +927,26 @@ impl AbiDecode for Bytes {
     }
 }
 
-// TODO: Uncomment when fixed. https://github.com/FuelLabs/sway/issues/6567
-// #[test]
-// fn ok_bytes_buffer_ownership() {
-//     let mut original_array = [1u8, 2u8, 3u8, 4u8];
-//     let slice = raw_slice::from_parts::<u8>(__addr_of(original_array), 4);
-
-//     // Check Bytes duplicates the original slice
-//     let mut bytes = Bytes::from(slice);
-//     bytes.set(0, 5);
-//     assert(original_array[0] == 1);
-
-//     // At this point, slice equals [5, 2, 3, 4]
-//     let encoded_slice = encode(bytes);
-
-//     // `Bytes` should duplicate the underlying buffer,
-//     // so when we write to it, it should not change
-//     // `encoded_slice` 
-//     let mut bytes = abi_decode::<Bytes>(encoded_slice);
-//     bytes.set(0, 6);
-//     assert(bytes.get(0) == Some(6));
-
-//     let mut bytes = abi_decode::<Bytes>(encoded_slice);
-//     assert(bytes.get(0) == Some(5));
-// }
+#[test]
+fn ok_bytes_buffer_ownership() {
+    let mut original_array = [1u8, 2u8, 3u8, 4u8];
+    let slice = raw_slice::from_parts::<u8>(__addr_of(original_array), 4);
+
+    // Check Bytes duplicates the original slice
+    let mut bytes = Bytes::from(slice);
+    bytes.set(0, 5);
+    assert(original_array[0] == 1);
+
+    // At this point, slice equals [5, 2, 3, 4]
+    let encoded_slice = encode(bytes);
+
+    // `Bytes` should duplicate the underlying buffer,
+    // so when we write to it, it should not change
+    // `encoded_slice` 
+    let mut bytes = abi_decode::<Bytes>(encoded_slice);
+    bytes.set(0, 6);
+    assert(bytes.get(0) == Some(6));
+
+    let mut bytes = abi_decode::<Bytes>(encoded_slice);
+    assert(bytes.get(0) == Some(5));
+}

sway-lib-std/src/vec.sw

@@ -705,27 +705,26 @@ impl<T> Iterator for VecIter<T> {
     }
 }
 
-// TODO: Uncomment when fixed. https://github.com/FuelLabs/sway/issues/6567
-// #[test]
-// fn ok_vec_buffer_ownership() {
-//     let mut original_array = [1u8, 2u8, 3u8, 4u8];
-//     let slice = raw_slice::from_parts::<u8>(__addr_of(original_array), 4);
-
-//     // Check Vec duplicates the original slice
-//     let mut bytes = Vec::<u8>::from(slice);
-//     bytes.set(0, 5);
-//     assert(original_array[0] == 1);
-
-//     // At this point, slice equals [5, 2, 3, 4]
-//     let encoded_slice = encode(bytes);
-
-//     // `Vec<u8>` should duplicate the underlying buffer,
-//     // so when we write to it, it should not change
-//     // `encoded_slice` 
-//     let mut bytes = abi_decode::<Vec<u8>>(encoded_slice);
-//     bytes.set(0, 6);
-//     assert(bytes.get(0) == Some(6));
-
-//     let mut bytes = abi_decode::<Vec<u8>>(encoded_slice);
-//     assert(bytes.get(0) == Some(5));
-// }
+#[test]
+fn ok_vec_buffer_ownership() {
+    let mut original_array = [1u8, 2u8, 3u8, 4u8];
+    let slice = raw_slice::from_parts::<u8>(__addr_of(original_array), 4);
+
+    // Check Vec duplicates the original slice
+    let mut bytes = Vec::<u8>::from(slice);
+    bytes.set(0, 5);
+    assert(original_array[0] == 1);
+
+    // At this point, slice equals [5, 2, 3, 4]
+    let encoded_slice = encode(bytes);
+
+    // `Vec<u8>` should duplicate the underlying buffer,
+    // so when we write to it, it should not change
+    // `encoded_slice` 
+    let mut bytes = abi_decode::<Vec<u8>>(encoded_slice);
+    bytes.set(0, 6);
+    assert(bytes.get(0) == Some(6));
+
+    let mut bytes = abi_decode::<Vec<u8>>(encoded_slice);
+    assert(bytes.get(0) == Some(5));
+}