Lower revert argument (#619)

ethereum · Jan 3, 2022 · 43c2ea1 · 43c2ea1
1 parent 17950f2
commit 43c2ea1
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 2 deletions.
diff --git a/crates/lowering/src/mappers/functions.rs b/crates/lowering/src/mappers/functions.rs
@@ -221,7 +221,9 @@ fn func_stmt(context: &mut FnContext, stmt: Node<fe::FuncStmt>) -> Vec<Node<fe::
         fe::FuncStmt::Pass => vec![stmt.kind],
         fe::FuncStmt::Break => vec![stmt.kind],
         fe::FuncStmt::Continue => vec![stmt.kind],
-        fe::FuncStmt::Revert { .. } => vec![stmt.kind],
+        fe::FuncStmt::Revert { error } => vec![fe::FuncStmt::Revert {
+            error: error.map(|expr| expressions::expr(context, expr)),
+        }],
     };
     let span = stmt.span;
 

diff --git a/crates/lowering/tests/snapshots/lowering__module_const.snap b/crates/lowering/tests/snapshots/lowering__module_const.snap
@@ -42,7 +42,7 @@ contract Foo:
                 return 3 * 10
             else:
                 if true:
-                    revert Bar(val=THREE)
+                    revert Bar(val=3)
 
 
 

diff --git a/crates/test-files/fixtures/crashes/revert_const.fe b/crates/test-files/fixtures/crashes/revert_const.fe
@@ -0,0 +1,7 @@
+const FOO: u256 = 0x101
+
+struct Error:
+  code: u256
+
+fn exit():
+  revert Error(code = FOO)
diff --git a/crates/tests/src/crashes.rs b/crates/tests/src/crashes.rs
@@ -18,3 +18,4 @@ macro_rules! test_file {
 
 test_file! { agroce531 }
 test_file! { agroce550 }
+test_file! { revert_const }
diff --git a/newsfragments/619.bugfix.md b/newsfragments/619.bugfix.md
@@ -0,0 +1,13 @@
+The argument to `revert` wasn't being lowered by the compiler,
+meaning that some `revert` calls would cause a compiler panic
+in later stages. For example:
+
+```
+const BAD_MOJO: u256 = 0xdeaddead
+
+struct Error:
+  code: u256
+
+fn fail():
+  revert Error(code = BAD_MOJO)
+```