Merge branch 'master' into vaivaswatha/issue6321

sway-core/src/semantic_analysis/ast_node/expression/intrinsic_function.rs

@@ -94,7 +94,7 @@ impl ty::TyIntrinsicFunctionKind {
                 type_check_contract_ret(handler, ctx, kind, arguments, type_arguments, span)
             }
             Intrinsic::EncodeBufferEmpty => {
-                type_check_encode_buffer_empty(ctx, kind, arguments, type_arguments, span)
+                type_check_encode_buffer_empty(handler, ctx, kind, arguments, type_arguments, span)
             }
             Intrinsic::EncodeBufferAppend => {
                 type_check_encode_append(handler, ctx, kind, arguments, type_arguments, span)
@@ -417,13 +417,20 @@ fn new_encoding_buffer_tuple(
 }
 
 fn type_check_encode_buffer_empty(
+    handler: &Handler,
     ctx: TypeCheckContext,
     kind: sway_ast::Intrinsic,
     arguments: &[Expression],
     _type_arguments: &[TypeArgument],
     span: Span,
 ) -> Result<(ty::TyIntrinsicFunctionKind, TypeId), ErrorEmitted> {
-    assert!(arguments.is_empty());
+    if !arguments.is_empty() {
+        return Err(handler.emit_err(CompileError::IntrinsicIncorrectNumArgs {
+            name: kind.to_string(),
+            expected: 0,
+            span,
+        }));
+    }
 
     let type_engine = ctx.engines.te();
     let engines = ctx.engines();
@@ -485,6 +492,14 @@ fn type_check_encode_append(
     _type_arguments: &[TypeArgument],
     span: Span,
 ) -> Result<(ty::TyIntrinsicFunctionKind, TypeId), ErrorEmitted> {
+    if arguments.len() != 2 {
+        return Err(handler.emit_err(CompileError::IntrinsicIncorrectNumArgs {
+            name: kind.to_string(),
+            expected: 2,
+            span,
+        }));
+    }
+
     let type_engine = ctx.engines.te();
     let engines = ctx.engines();
 

test/src/e2e_vm_tests/test_programs/should_fail/encode_append_wrong_args/Forc.lock

@@ -0,0 +1,3 @@
+[[package]]
+name = "encode_append_wrong_args"
+source = "member"

test/src/e2e_vm_tests/test_programs/should_fail/encode_append_wrong_args/Forc.toml

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

test/src/e2e_vm_tests/test_programs/should_fail/encode_append_wrong_args/json_abi_oracle.json

@@ -0,0 +1 @@
+[]

test/src/e2e_vm_tests/test_programs/should_fail/encode_append_wrong_args/src/main.sw

@@ -0,0 +1,17 @@
+library;
+
+pub struct Buffer {
+    buffer: u64
+}
+
+pub trait T {
+    fn ar(buffer: Buffer) -> Buffer;
+}
+
+impl T for str[10] {
+    fn ar(buffer: Buffer) -> Buffer {
+        Buffer {
+            buffer: __encode_buffer_append(buffer.buffer)
+        }
+    }
+}

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

@@ -0,0 +1,7 @@
+category = "fail"
+
+# check: $()warning
+# check: $()buffer: __encode_buffer_append(buffer.buffer)
+
+# check: $()buffer: __encode_buffer_append(buffer.buffer)
+# nextln: $()Call to "encode_buffer_append" expects 2 arguments

test/src/e2e_vm_tests/test_programs/should_fail/encode_buffer_empty_with_args/Forc.lock

@@ -0,0 +1,8 @@
+[[package]]
+name = "core"
+source = "path+from-root-BABDDF1B461AF6DA"
+
+[[package]]
+name = "encode_buffer_empty_with_args"
+source = "member"
+dependencies = ["core"]

test/src/e2e_vm_tests/test_programs/should_fail/encode_buffer_empty_with_args/Forc.toml

@@ -0,0 +1,8 @@
+[project]
+authors = ["Fuel Labs <contact@fuel.sh>"]
+license = "Apache-2.0"
+name = "encode_buffer_empty_with_args"
+entry = "main.sw"
+
+[dependencies]
+core = { path = "../../../../../../sway-lib-core" }

test/src/e2e_vm_tests/test_programs/should_fail/encode_buffer_empty_with_args/json_abi_oracle.json

@@ -0,0 +1 @@
+[]

test/src/e2e_vm_tests/test_programs/should_fail/encode_buffer_empty_with_args/src/main.sw

@@ -0,0 +1,13 @@
+library;
+
+struct Buffer {
+    buffer: (raw_ptr, u64, u64),
+}
+
+impl Buffer {
+    pub fn new() -> Self {
+        Buffer {
+            buffer: __encode_buffer_empty(self),
+        }
+    }
+}

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

@@ -0,0 +1,4 @@
+category = "fail"
+
+# check: $()buffer: __encode_buffer_empty(self),
+# nextln: $()Call to "encode_buffer_empty" expects 0 arguments