Lowering pass and augmented assignments #338

g-r-a-n-t · 2021-03-25T18:48:04Z

Added a lowering pass to the compiler module and used it to support augmented assignments.

e.g. foo += 1 becomes foo = foo + 1

To-Do

OPTIONAL: Update Spec if applicable
Add entry to the release notes (may forgo for trivial changes)
Clean up commit history

compiler/src/yul/mappers/expressions.rs

compiler/src/lowering/mappers/contracts.rs

compiler/src/lowering/mappers/expressions.rs

compiler/src/lowering/mappers/functions.rs

compiler/tests/fixtures/features/aug_assign.fe

compiler/src/lowering/mappers/functions.rs

codecov-io · 2021-03-26T17:13:14Z

Codecov Report

Merging #338 (815e4bf) into master (dd017d8) will increase coverage by 0.16%.
The diff coverage is 98.37%.

❗ Current head 815e4bf differs from pull request most recent head 4f4f5a8. Consider uploading reports for the commit 4f4f5a8 to get more accurate results

@@            Coverage Diff             @@
##           master     #338      +/-   ##
==========================================
+ Coverage   92.60%   92.77%   +0.16%     
==========================================
  Files          56       59       +3     
  Lines        3882     4000     +118     
==========================================
+ Hits         3595     3711     +116     
- Misses        287      289       +2

Impacted Files	Coverage Δ
analyzer/src/traversal/assignments.rs	`96.66% <ø> (ø)`
compiler/src/yul/mappers/expressions.rs	`90.19% <ø> (ø)`
compiler/src/lowering/mappers/module.rs	`75.00% <75.00%> (ø)`
analyzer/src/traversal/functions.rs	`97.41% <100.00%> (+0.02%)`	⬆️
compiler/src/lib.rs	`90.32% <100.00%> (+0.32%)`	⬆️
compiler/src/lowering/mappers/expressions.rs	`100.00% <100.00%> (ø)`
compiler/src/lowering/mappers/functions.rs	`100.00% <100.00%> (ø)`
compiler/src/lowering/mod.rs	`100.00% <100.00%> (ø)`
parser/src/node.rs	`80.95% <100.00%> (+3.17%)`	⬆️
... and 2 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dd017d8...4f4f5a8. Read the comment docs.

analyzer/src/traversal/assignments.rs

compiler/src/lowering/mappers/contracts.rs

compiler/src/lowering/mappers/expressions.rs

g-r-a-n-t · 2021-03-26T22:43:19Z

compiler/src/lowering/mappers/functions.rs

+    unreachable!()
+}
+
+fn func_stmt(context: &Context, stmt: Node<fe::FuncStmt>) -> Vec<Node<fe::FuncStmt>> {


Note: returning a vec here because we'll have lowerings like:

(foo, bar): (u256, u256) = my_tuple

to

foo: u256 = my_tuple.item0 bar: u256 = my_tuple.item1

which requires that we be able to map a single statement to multiple statements.

This is a good candidate for SmallVec<[Node<..>, 1]> in some possible future performance optimization.

Makes sense. I'll track this in an issue.

compiler/src/lowering/mappers/functions.rs

compiler/src/lowering/mod.rs

parser/src/node.rs

src/main.rs

g-r-a-n-t · 2021-03-29T19:45:44Z

compiler/src/yul/mappers/expressions.rs

@@ -278,7 +278,7 @@ pub fn expr_bin_operation(context: &Context, exp: &Node<fe::Expr>) -> yul::Expre
                }
                _ => unreachable!(),
            },
-            _ => unimplemented!(),
+            fe::BinOperator::FloorDiv => unimplemented!(),


g-r-a-n-t · 2021-03-29T19:48:31Z

compiler/tests/fixtures/features/aug_assign.fe

@@ -0,0 +1,57 @@
+contract Foo:


It would be nice to have some tests that check that source files are correctly lowered. We need to be able to pretty-print ASTs for this, tho. See #326.

g-r-a-n-t · 2021-03-29T20:53:31Z

analyzer/src/traversal/assignments.rs

+        value,
+    } = &stmt.kind
+    {
+        let target_attributes = expressions::expr(Rc::clone(&scope), Rc::clone(&context), target)?;


relevant: #345

sbillig · 2021-03-30T18:09:48Z

compiler/src/lowering/mappers/expressions.rs

+
+/// Lowers a boxed expression.
+#[allow(clippy::boxed_local)]
+pub fn boxed_expr(context: &Context, exp: Box<Node<fe::Expr>>) -> Box<Node<fe::Expr>> {


This is another pattern that might be worth optimizing in the future, or might not matter; we take a boxed expr, probably don't modify it, and rebox. An extra allocation for every expr.

sbillig

Looks good. My only (mild) concern is potential performance issues with all the allocations happening. Probably won't matter in practice, and if it does we can work on that later. (See inline comments above).

g-r-a-n-t marked this pull request as draft March 25, 2021 18:48

g-r-a-n-t commented Mar 26, 2021

View reviewed changes

compiler/src/yul/mappers/expressions.rs Outdated Show resolved Hide resolved

g-r-a-n-t commented Mar 26, 2021

View reviewed changes

compiler/src/lowering/mappers/functions.rs Outdated Show resolved Hide resolved

g-r-a-n-t mentioned this pull request Mar 26, 2021

Remove FloorDiv #341

Closed

g-r-a-n-t force-pushed the lowering-pass-aug-assign branch from 6801c55 to aead595 Compare March 26, 2021 16:40

g-r-a-n-t force-pushed the lowering-pass-aug-assign branch 2 times, most recently from 548d5f9 to fb0f056 Compare March 26, 2021 22:32

g-r-a-n-t commented Mar 26, 2021

View reviewed changes

g-r-a-n-t force-pushed the lowering-pass-aug-assign branch from fb0f056 to 815e4bf Compare March 29, 2021 19:42

g-r-a-n-t commented Mar 29, 2021

View reviewed changes

Lowering pass and augmented assignments.

4f4f5a8

g-r-a-n-t force-pushed the lowering-pass-aug-assign branch from 815e4bf to 4f4f5a8 Compare March 29, 2021 19:54

g-r-a-n-t marked this pull request as ready for review March 29, 2021 19:54

g-r-a-n-t requested a review from sbillig March 29, 2021 20:45

g-r-a-n-t commented Mar 29, 2021

View reviewed changes

g-r-a-n-t mentioned this pull request Mar 29, 2021

Allow hexadecimal/octal/binary numeric literals #333

Closed

sbillig reviewed Mar 30, 2021

View reviewed changes

sbillig approved these changes Mar 30, 2021

View reviewed changes

g-r-a-n-t merged commit fa7cbfe into ethereum:master Mar 30, 2021

This was referenced Mar 31, 2021

Implement a "desugaring" pass that turns Fe code into other Fe code #205

Closed

Lowering pass and tuple support #306

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Lowering pass and augmented assignments #338

Lowering pass and augmented assignments #338

g-r-a-n-t commented Mar 25, 2021 •

edited

Loading

codecov-io commented Mar 26, 2021 •

edited

Loading

g-r-a-n-t Mar 26, 2021

sbillig Mar 30, 2021

g-r-a-n-t Mar 30, 2021

g-r-a-n-t Mar 29, 2021

g-r-a-n-t Mar 29, 2021

g-r-a-n-t Mar 29, 2021

sbillig Mar 30, 2021

sbillig left a comment

Lowering pass and augmented assignments #338

Lowering pass and augmented assignments #338

Conversation

g-r-a-n-t commented Mar 25, 2021 • edited Loading

To-Do

codecov-io commented Mar 26, 2021 • edited Loading

Codecov Report

g-r-a-n-t Mar 26, 2021

Choose a reason for hiding this comment

sbillig Mar 30, 2021

Choose a reason for hiding this comment

g-r-a-n-t Mar 30, 2021

Choose a reason for hiding this comment

g-r-a-n-t Mar 29, 2021

Choose a reason for hiding this comment

g-r-a-n-t Mar 29, 2021

Choose a reason for hiding this comment

g-r-a-n-t Mar 29, 2021

Choose a reason for hiding this comment

sbillig Mar 30, 2021

Choose a reason for hiding this comment

sbillig left a comment

Choose a reason for hiding this comment

g-r-a-n-t commented Mar 25, 2021 •

edited

Loading

codecov-io commented Mar 26, 2021 •

edited

Loading