Merge cf736bf into 32c3f00

compiler/src/yul/mappers/functions.rs

@@ -188,10 +188,15 @@ fn emit(context: &Context, stmt: &Node<fe::FuncStmt>) -> yul::Statement {
 }
 
 fn assert(context: &Context, stmt: &Node<fe::FuncStmt>) -> yul::Statement {
-    if let fe::FuncStmt::Assert { test, msg: _ } = &stmt.kind {
+    if let fe::FuncStmt::Assert { test, msg } = &stmt.kind {
         let test = expressions::expr(context, test);
-
-        return statement! { if (iszero([test])) { (revert(0, 0)) } };
+        return match msg {
+            Some(val) => {
+                let msg = expressions::expr(context, val);
+                statement! { if (iszero([test])) { (revert_with_reason_string([msg])) } }
+            }
+            None => statement! { if (iszero([test])) { (revert(0, 0)) } },
+        };
     }
 
     unreachable!()

compiler/src/yul/runtime/functions/data.rs

@@ -3,30 +3,31 @@ use yultsur::*;
 /// Return all data runtime functions
 pub fn all() -> Vec<yul::Statement> {
     vec![
-        avail(),
-        alloc(),
         alloc_mstoren(),
-        free(),
+        alloc(),
+        avail(),
+        bytes_mcopys(),
+        bytes_scopym(),
+        bytes_scopys(),
+        bytes_sloadn(),
+        bytes_sstoren(),
         ccopym(),
+        ceil32(),
+        cloadn(),
+        free(),
         load_data_string(),
+        map_value_ptr(),
+        mcopym(),
         mcopys(),
+        mloadn(),
+        mstoren(),
+        revert_with_reason_string(),
         scopym(),
-        mcopym(),
         scopys(),
-        mloadn(),
+        set_zero(),
         sloadn(),
-        bytes_sloadn(),
-        cloadn(),
-        mstoren(),
         sstoren(),
-        bytes_sstoren(),
-        bytes_mcopys(),
-        bytes_scopym(),
-        bytes_scopys(),
-        map_value_ptr(),
-        ceil32(),
         ternary(),
-        set_zero(),
     ]
 }
 
@@ -380,3 +381,28 @@ pub fn load_data_string() -> yul::Statement {
         }
     }
 }
+
+/// Revert with encoded reason string
+pub fn revert_with_reason_string() -> yul::Statement {
+    function_definition! {
+        function revert_with_reason_string(reason) {
+            // Function selector for Error(string)
+            (let ptr := alloc_mstoren(0x08C379A0, 4))
+
+            // Write the (fixed) data offset into the next 32 bytes of memory
+            (pop((alloc_mstoren(0x0000000000000000000000000000000000000000000000000000000000000020, 32))))
+
+            // Read the size of the string
+            (let reason_size := mloadn(reason, 32))
+
+            //Copy the whole reason string (length + data) to the current segment of memory
+            (pop((mcopym(reason , (add(reason_size, 32))))))
+
+            // Right pad the reason bytes to a multiple of 32 bytes
+            (let padding := sub((ceil32(reason_size)), reason_size))
+            (pop((alloc(padding))))
+
+            (revert(ptr, (add(68, (add(reason_size, padding))))))
+        }
+    }
+}

compiler/tests/features.rs

@@ -75,17 +75,41 @@ fn test_assert() {
 
         let exit1 = harness.capture_call(&mut executor, "bar", &[uint_token(4)]);
 
-        assert!(matches!(
-            exit1,
-            evm::Capture::Exit((evm::ExitReason::Revert(_), _))
-        ));
+        match exit1 {
+            evm::Capture::Exit((evm::ExitReason::Revert(_), output)) => assert_eq!(output.len(), 0),
+            _ => panic!("Did not revert correctly"),
+        }
 
         let exit2 = harness.capture_call(&mut executor, "bar", &[uint_token(42)]);
 
         assert!(matches!(
             exit2,
             evm::Capture::Exit((evm::ExitReason::Succeed(_), _))
-        ))
+        ));
+
+        let exit3 =
+            harness.capture_call(&mut executor, "revert_with_static_string", &[uint_token(4)]);
+
+        match exit3 {
+            evm::Capture::Exit((evm::ExitReason::Revert(_), output)) => {
+                assert_eq!(output, encode_error_reason("Must be greater than five"))
+            }
+            _ => panic!("Did not revert correctly"),
+        }
+
+        let reason = "A very looooooooooooooong reason that consumes multiple words";
+        let exit4 = harness.capture_call(
+            &mut executor,
+            "revert_with",
+            &[uint_token(4), string_token(&reason)],
+        );
+
+        match exit4 {
+            evm::Capture::Exit((evm::ExitReason::Revert(_), output)) => {
+                assert_eq!(output, encode_error_reason(reason))
+            }
+            _ => panic!("Did not revert correctly"),
+        }
     })
 }
 

compiler/tests/fixtures/features/assert.fe

@@ -1,3 +1,9 @@
 contract Foo:
     pub def bar(baz: u256):
-        assert baz > 5
+        assert baz > 5
+
+    pub def revert_with_static_string(baz: u256):
+        assert baz > 5, "Must be greater than five"
+
+    pub def revert_with(baz: u256, reason: string1000):
+        assert baz > 5, reason

compiler/tests/fixtures/solidity/revert_test.sol

@@ -0,0 +1,13 @@
+contract Foo {
+  function revert_me() public pure returns(uint){
+    revert("Not enough Ether provided.");
+  }
+
+  function revert_with_long_string() public pure returns(uint){
+    revert("A muuuuuch longer reason string that consumes multiple words");
+  }
+
+  function revert_with_empty_string() public pure returns(uint){
+    revert("");
+  }
+}