Rework ElimByName and combine with new phase HoistSuperArgs #2282
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DarkDimius
reviewed
Apr 21, 2017
tests/neg/tailcall/t1672b.scala
Outdated
| @@ -46,7 +46,7 @@ object Test1772B { | |||
| else 1 + (try { | |||
| throw new RuntimeException | |||
| } catch { | |||
| case _: Throwable => bar(i - 1) // old-error | |||
| case _: Throwable => bar(i - 1) // error | |||
There was a problem hiding this comment.
why was this test affected? It doesn't seem to have anything to do with by-name changes.
This PR is awesome! |
odersky
changed the title
DarkDimius
approved these changes
Apr 28, 2017
| abstract class TransformByNameApply extends MiniPhaseTransform { thisTransformer: DenotTransformer => | ||
| import ast.tpd._ | ||
|
|
||
| /** The info of the tree's symbol at phase Nullarify (i.e. before transformation) */ |
There was a problem hiding this comment.
nullarify phase doesn't exist anymore
| tree.symbol.denot(ctx.withPhase(thisTransformer)) | ||
|
|
||
| /** If denotation had an ExprType before, it now gets a function type */ | ||
| protected def exprBecomesFunction(symd: SymDenotation)(implicit ctx: Context) = |
There was a problem hiding this comment.
No it's used in elimByName
|
|
||
| override def mkClosure(arg: Tree, argType: Type)(implicit ctx: Context): Tree = { | ||
| val meth = ctx.newSymbol( | ||
| ctx.owner, nme.ANON_FUN, Synthetic | Method, MethodType(Nil, Nil, argType)) |
There was a problem hiding this comment.
I'd prefer to give it more informative name that indicates that it originated from by-name param.
Helps when reading bytecode.
| case tp: NamedType | ||
| if (tp.symbol.owner == cls || tp.symbol.owner == constr) && | ||
| tp.symbol.is(ParamOrAccessor) => | ||
| val mappedSym = origParams.zip(paramSyms).toMap.apply(tp.symbol) |
There was a problem hiding this comment.
maybe extract origParams.zip(paramSyms).toMap to a lazy val inside this TTM?
changeOwner already does this.
- Make it use changeOwnerAfter - Factor out TransformByNameApply as a common base trait between it and ElimByName
Used to fail in backend when reference of closure was to a static method. The test case failing is 2127.scala
Hoist complex supercall arguments out of the class they appear in. This avoids a lot of complexity later on in other transformation phases.
and special handling involved in it. Require the phases that used ti to be after phase HoistInSuperCall instead.
Do the necessary changes to combine HoistSuperArgs and ByNameClosures. Also, polishings.
Also hoist complex arguments out of this-calls of secondary constructors.
odersky
force-pushed
the
changle-elimbyname
branch
from
2ee4db6 to
b14969c
Compare
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We split ElimByName so that we can create the necessary closures before a new phase that hoists supercall arguments out of the call. New sequence of phases: