Move inline β-reduction out of typer #5216

nicolasstucki · 2018-10-08T08:46:15Z

Move inlining after Pickler into InlineCalls phase which only runs if there is something to inline.

The issue is that we created bindings of the form `val xyz_this: => XYZ = ...`

nicolasstucki · 2018-10-09T08:04:12Z

test performance please

dottybot · 2018-10-09T08:06:00Z

performance test scheduled: 1 job(s) in queue, 0 running.

dottybot · 2018-10-09T09:46:13Z

Performance test finished successfully:

Visit http://dotty-bench.epfl.ch/5216/ to see the changes.

Benchmarks is based on merging with master (7463afe)

When inlining a `this` binding that referes to a result typed with a match type, this type must be normalized and used.

Previously the `implicitly[C]` was refining its return type of `ev` by inlining. As we are now inlining after typer we refine the return type explicitly to `ev.type`.

nicolasstucki · 2018-10-09T17:46:55Z

test performance please

dottybot · 2018-10-09T17:47:20Z

performance test scheduled: 1 job(s) in queue, 0 running.

dottybot · 2018-10-09T19:26:32Z

Performance test finished successfully:

Visit http://dotty-bench.epfl.ch/5216/ to see the changes.

Benchmarks is based on merging with master (7a45a4a)

Duhemm

If no Inlined nodes can appear before InlineCalls, I think that you can also remove some cases from the sbt phases.

compiler/src/dotty/tools/dotc/transform/InlineCalls.scala

compiler/src/dotty/tools/dotc/transform/PostTyper.scala

compiler/src/dotty/tools/dotc/decompiler/TASTYDecompiler.scala

odersky

I would argue that the rhs of erased types should be erased in PostTyper (and don't need an inline expansion either). Otherwise LGTM.

odersky · 2018-10-20T07:35:37Z

compiler/src/dotty/tools/dotc/transform/PostTyper.scala

-    /** Transforms the rhs tree into a its default tree if it is in an `erased` val/def.
-    *  Performed to shrink the tree that is known to be erased later.
-    */
-    private def normalizeErasedRhs(rhs: Tree, sym: Symbol)(implicit ctx: Context) =


What happens to erased right hand sides now? Are they kept? Why can't they be dropped here?

The right-hand sides are kept as they were before. Implicit arguments to erased methods are removed early (as (???: T)).

This logic was only droping nodes that where inlined in an erased rhs, the rest was unaffected.

I tried to erase the rhs of erased val/def that are not inline. But YCheck complained on most erased tests. I will investigate further.

I managed to implement it, now rhs of erased non inlined methods are removed in PostTyper

nicolasstucki · 2018-10-22T11:44:54Z

@odersky the last commit erases the RHS of erased def/val in PostTyper.

Move inline β-reduction out of typer

6acaf31

nicolasstucki added the stat:wip label Oct 8, 2018

nicolasstucki self-assigned this Oct 8, 2018

nicolasstucki added 2 commits October 8, 2018 13:50

Fix this bindings for ExprType

017edbd

The issue is that we created bindings of the form `val xyz_this: => XYZ = ...`

Temporarily disable 2 tests

9aa3811

nicolasstucki force-pushed the move-inline-out-of-typer branch from 246df88 to 4b9cc39 Compare October 8, 2018 15:41

Move inline β-reduction after post typer

432eb0a

nicolasstucki force-pushed the move-inline-out-of-typer branch from 4b9cc39 to 432eb0a Compare October 8, 2018 16:37

nicolasstucki added 2 commits October 8, 2018 19:18

Normalize call at Inlined node creation

746fdd7

Move inline β-reduction after Pickler

c68dc1f

nicolasstucki force-pushed the move-inline-out-of-typer branch from 7ff4e80 to c68dc1f Compare October 8, 2018 18:46

Fix constant folding during inlining

32c8798

nicolasstucki force-pushed the move-inline-out-of-typer branch from 63c8038 to 32c8798 Compare October 8, 2018 19:19

Add a bit of documentation

da0c249

nicolasstucki force-pushed the move-inline-out-of-typer branch 3 times, most recently from 3c9f76c to 8543a33 Compare October 8, 2018 20:49

allanrenucci mentioned this pull request Oct 9, 2018

Macro/Inline TODOs #5132

Closed

8 tasks

nicolasstucki force-pushed the move-inline-out-of-typer branch 2 times, most recently from 456f075 to db7e183 Compare October 9, 2018 07:22

Check if unpickled tree has inline nodes

927ae4e

nicolasstucki force-pushed the move-inline-out-of-typer branch from db7e183 to 927ae4e Compare October 9, 2018 14:09

Fix tuples inlining

c6c5389

When inlining a `this` binding that referes to a result typed with a match type, this type must be normalized and used.

nicolasstucki force-pushed the move-inline-out-of-typer branch from 0101eb6 to c6c5389 Compare October 9, 2018 15:26

nicolasstucki added 3 commits October 9, 2018 17:27

Fix dependent function type test

9e14dee

Previously the `implicitly[C]` was refining its return type of `ev` by inlining. As we are now inlining after typer we refine the return type explicitly to `ev.type`.

Only run InlineCalls if the tree contains an inline call

f28e2e1

Update doc

0832e02

nicolasstucki force-pushed the move-inline-out-of-typer branch from 4c4733c to 0832e02 Compare October 9, 2018 17:18

nicolasstucki added stat:needs review and removed stat:wip labels Oct 9, 2018

nicolasstucki requested a review from odersky October 9, 2018 17:48

nicolasstucki assigned odersky and unassigned nicolasstucki Oct 9, 2018

nicolasstucki mentioned this pull request Oct 11, 2018

Move inlining into ReifyQuotes and remove Inlined from TASTy #5241

Merged

Update comment

894ecee

nicolasstucki force-pushed the move-inline-out-of-typer branch from 6eebf53 to 894ecee Compare October 16, 2018 14:56

Duhemm reviewed Oct 17, 2018

View reviewed changes

nicolasstucki added 2 commits October 18, 2018 07:58

Fix typo

72f3ab6

Add isInlineCall to TreeInfo

954c25b

nicolasstucki mentioned this pull request Oct 18, 2018

Issue typing tail of generic Tuple3 after ReifyQuotes #5269

Closed

odersky requested changes Oct 20, 2018

View reviewed changes

odersky assigned nicolasstucki and unassigned odersky Oct 20, 2018

nicolasstucki force-pushed the move-inline-out-of-typer branch 2 times, most recently from 8d3c7a2 to 444943a Compare October 20, 2018 11:43

nicolasstucki assigned odersky and unassigned nicolasstucki Oct 20, 2018

Erase rhs of erased non inlined val/def in PostTyper

c12e875

nicolasstucki force-pushed the move-inline-out-of-typer branch from 6d9474b to c12e875 Compare October 22, 2018 06:00

odersky approved these changes Oct 22, 2018

View reviewed changes

odersky merged commit 7067122 into scala:master Oct 22, 2018

allanrenucci deleted the move-inline-out-of-typer branch October 22, 2018 15:03

Duhemm mentioned this pull request Nov 23, 2018

Can we store the original call before inline? #5503

Closed

Move inline β-reduction out of typer #5216

Move inline β-reduction out of typer #5216

Uh oh!

Conversation

nicolasstucki commented Oct 8, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nicolasstucki commented Oct 9, 2018

Uh oh!

dottybot commented Oct 9, 2018

Uh oh!

dottybot commented Oct 9, 2018

Uh oh!

nicolasstucki commented Oct 9, 2018

Uh oh!

dottybot commented Oct 9, 2018

Uh oh!

dottybot commented Oct 9, 2018

Uh oh!

Duhemm left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

odersky left a comment

Choose a reason for hiding this comment

Uh oh!

odersky Oct 20, 2018

Choose a reason for hiding this comment

Uh oh!

nicolasstucki Oct 20, 2018

Choose a reason for hiding this comment

Uh oh!

nicolasstucki Oct 20, 2018

Choose a reason for hiding this comment

Uh oh!

nicolasstucki Oct 20, 2018

Choose a reason for hiding this comment

Uh oh!

nicolasstucki commented Oct 22, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

nicolasstucki commented Oct 8, 2018 •

edited

Loading