support for string slice

FuelLabs · Dec 2, 2024 · 6f3f3be · 6f3f3be
1 parent 63da357
commit 6f3f3be
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/sway-core/src/language/ty/program.rs b/sway-core/src/language/ty/program.rs
@@ -209,9 +209,6 @@ impl TyProgram {
                                 field.type_argument.type_id,
                                 &field.type_argument,
                                 |t| match t {
-                                    TypeInfo::StringSlice => {
-                                        Some(TypeNotAllowedReason::StringSliceInConfigurables)
-                                    }
                                     TypeInfo::RawUntypedPtr => Some(
                                         TypeNotAllowedReason::TypeNotAllowedInContractStorage {
                                             ty: engines.help_out(t).to_string(),
@@ -396,7 +393,6 @@ impl TyProgram {
                 c.return_type,
                 &c.type_ascription,
                 |t| match t {
-                    TypeInfo::StringSlice => Some(TypeNotAllowedReason::StringSliceInConfigurables),
                     TypeInfo::Slice(_) => Some(TypeNotAllowedReason::SliceInConst),
                     _ => None,
                 },

diff --git a/sway-error/src/error.rs b/sway-error/src/error.rs
@@ -2804,9 +2804,6 @@ pub enum TypeNotAllowedReason {
     #[error("Returning `str` or a type containing `str` from `main()` is not allowed.")]
     StringSliceInMainReturn,
 
-    #[error("`str` or a type containing `str` on `configurables` is not allowed.")]
-    StringSliceInConfigurables,
-
     #[error("`str` or a type containing `str` on `const` is not allowed.")]
     StringSliceInConst,
 

diff --git a/sway-lib-core/src/codec.sw b/sway-lib-core/src/codec.sw
@@ -2522,6 +2522,7 @@ pub fn abi_decode_in_place<T>(ptr: raw_ptr, len: u64, target: raw_ptr)
 where
     T: AbiDecode,
 {
+    asm(ptr: ptr) { log ptr ptr ptr ptr; }
     let mut buffer = BufferReader::from_parts(ptr, len);
     let temp = T::abi_decode(buffer);
     asm(
@@ -2635,6 +2636,7 @@ impl AbiDecode for str {
     fn abi_decode(ref mut buffer: BufferReader) -> str {
         let len = buffer.read_8_bytes::<u64>();
         let data = buffer.read_bytes(len);
+        asm(data: data, len: len, a: 0) { log data len a a; };
         asm(s: (data.ptr(), len)) {
             s: str
         }

diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/src/main.sw
@@ -42,6 +42,7 @@ configurable {
     TUPLE_BOOL_U64: (bool, u64) = (true, 11),
     STR_4: str[4] = __to_str_array("abcd"),
     VEC_U8: Vec<u8> = Vec::new(),
+    STRING_SLICE: str = "Hello, Sway",
 
     // The test runner does not have a way to calculate the dynamic part of the data section
     // This configurable guarantee that all the others have their buffer size calculated correctly.
@@ -73,6 +74,8 @@ fn main() {
     assert(TUPLE_BOOL_U64.1 == 11);
     assert(sha256_str_array(STR_4) == sha256("abcd"));
     assert(VEC_U8.len() == 0);
+    //__log(STRING_SLICE);
+    //assert(sha256(STRING_SLICE) == sha256("Hello, Sway"));
 
     // Assert address do not change
     let addr_1 = asm(addr: __addr_of(&BOOL)) {

diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/test.toml
@@ -2,7 +2,7 @@ category = "run"
 expected_result = { action = "return", value = 0 }
 expected_result_new_encoding = { action = "return_data", value = "" }
 validate_abi = true
-expected_warnings = 2
+expected_warnings = 3
 unsupported_profiles = ["debug"]
 
 # check: $()ANOTHER_U8 8