-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Fix ClassCastException in SAM conversion with call-by-name argument [ci: last-only] #10830
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: 2.13.x
Are you sure you want to change the base?
Conversation
| val typedNewFun = localTyper.typedPos(fun.pos)(Block(liftedMethod :: Nil, super.transform(newFun))) | ||
| if (mustExpand) { | ||
| val Block(stats, expr : Function) = typedNewFun: @unchecked | ||
| treeCopy.Block(typedNewFun, stats, gen.expandFunction(localTyper)(expr, inConstructorFlag)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Spent too much time on understanding this thing... comparing with
def f(x: => Int) = 0
def g(x: => Int) = f(x)
here it's not noApply that is in the works, but the x tree is added to byNameArgs.
I was wondering why it doesn't work here.
The compiler first creates ((x1: Box, x2: () => Box) => $anonfun$run(x1, x2)), runs super.transform on it, and then translates that into the anonymous class with def append(f1: Box, f2: () => Box): Box = $anonfun$run(f1, f2.apply()).
The .apply() is the bug. The issue is that byNameArgs no longer works on the second transformation.
because at the second pass, fn.tpe already has the post-uncurry type, I guess from here
so fnParams no longer has by name => Box, but () => Box. Then the f2 argument tree is not added to byNameArgs, and the apply is added.
Your fix looks fine, I was just not 100% it would only ever trigger in that case we are looking at, or if it might cause other changes. So I went into the rabbit hole.
Maybe you have more thoughts..
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I ought to have written it up. I spent a day to understand LL220, and wasn't confident in the desired behavior until I saw that dotty does the same thing (that is, the same result as this PR).
I think I had a different approach but finally did LL250 when I ran out of patience. This looks too brute-force or ad-hoc to me now. Maybe it seemed natural after looking at the trees for hours.
I remember wondering why L223 doesn't use attachments.contains, and assumed I would make another pass here, but didn't want to spend a half-day on subtleties about attachments. (contains does not use retronym's hand-rolled set function.)
At a minimum, I'll respool and document.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This would be the right fix I think https://github.com/scala/scala/compare/2.13.x...lrytz:scala:pr10830?expand=1
But it needs to be fixed for multiple param lists, Apply(Apply(f), args0), args1) we need to get the second params.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll make some time now for the more thoughts you asked for.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"I spent too much time" etc. I think my previous idea was to pass a flag to say "this is just a forwarder", but today I noticed that you can detect it because the forwarder has (x: () => T) => R instead of (x: => T) => R. The method param and the function param happen to be mismatched. More precisely, the vparam.tpt is a function type, while the symbol.info is cbn. I exploit that to tag references with PreserveArg attachment. (That could be improved to do only cbn args, but I think for a forwarder that is always the case.)
Today I was looking at the change in TreeGen, which I previously avoided. I looked again at how byNameArgs is used and it's still not clear to me. Maybe if I take a quick power nap first.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the current logic in UnCurry is fine and we don't need anything specific for this bug.
The underlying issue is that the check isByNameParamType(param.info) tests a param of a MethodType that went through the uncurry type map, which replaces by-name params (DesugaredParameterType).
If we get the param symbol from the method symbol (and not from the AST), then it has a full type history and we see (during uncurry) that it's by-name. And it cleans up the thing explained in the comment ("Read the param symbols before transform(fn)...").
88d0d02 to
9cc281e
Compare
9cc281e to
adea02c
Compare
|
@som-snytt is this ready for review? |
ClassCastException on call to trait method with call-by-name argument, if implemented as SAM
|
change title to I'll redraft to review the summertime review. |
bc2da58 to
c17d9cc
Compare
|
The current tweak avoids the moving parts by just intervening after the "expansion" of the function into the sam class that just forwards to a method with the function body for a rhs. The forwarding expression should never apply any by-name args, so for simplicity all of the args are added to |
| body.last match { | ||
| case dd: DefDef => | ||
| treeInfo.dissectApplied(dd.rhs).argss match { | ||
| case args :: _ => args.foreach(noApply.addOne) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could we put the noApply tag directly when the trees are created in gen.expandFunction, by making noApply a tree attachment?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that was the previous version? but I'll look again with so-called fresh eyes.
c17d9cc to
7a77a6a
Compare
ClassCastException on call to trait method with call-by-name argument, if implemented as SAMClassCastException on call to trait method with call-by-name argument, if implemented as SAM [ci: last-only]
7a77a6a to
7580983
Compare
ClassCastException on call to trait method with call-by-name argument, if implemented as SAM [ci: last-only]7580983 to
fb3461a
Compare
Follow lrytz advice to consult symbol of fun tree (for fidelity to cbn). It's just used to notice that an arg needs
noApplybetween transforms. (The symbol yields cbn, the tree yields not cbn.) The full advice was to also usefun.symbol.infofor varargs (stay tuned). The two sets for tracking "pass-thru by-name args" and "unwrapped by-name arg in() => arg" are combined, which may work after all.Fixes scala/bug#11237