Treat `Function` literals uniformly, expecting SAM or FunctionN.

They both compile to INDY/MetaLambdaFactory, except when they
occur in a constructor call. (TODO: can we lift the ctor arg
expression to a method and avoid statically synthesizing
anonymous subclass altogether?)

Typers:
  - no longer synthesize SAMs -- *adapt* a Function literal
    to the expected (SAM/FunctionN) type
  - Deal with polymorphic/existential sams (relevant tests:
    pos/t8310, pos/t5099.scala, pos/t4869.scala) We know where
    to find the result type, as all Function nodes have a
    FunctionN-shaped type during erasure. (Including function
    literals targeting a SAM type -- the sam type is tracked as
    the *expected* type.)

    Lift restriction on sam types being class types. It's enough
    that they dealias to one, like regular instance creation
    expressions.

Contexts:
  - No longer need encl method hack for return in sam.

Erasure:
  - erasure preserves SAM type for function nodes
  - Normalize sam to erased function type during erasure,
    otherwise we may box the function body from `$anonfun(args)`
    to `{$anonfun(args); ()}` because the expected type for the
    body is now `Object`, and thus `Unit` does not conform.

Delambdafy:
  - must set static flag before calling createBoxingBridgeMethod
  - Refactored `createBoxingBridgeMethod` to wrap my head around
    boxing, reworked it to generalize from FunctionN's boxing
    needs to arbitrary LMF targets.

Other refactorings: ThisReferringMethodsTraverser, TreeGen.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/compiler/scala/tools/nsc/transform/UnCurry.scala b/src/compiler/scala/tools/nsc/transform/UnCurry.scala
index c142c96e66..7e9e0e2a92 100644
--- a/src/compiler/scala/tools/nsc/transform/UnCurry.scala
+++ b/src/compiler/scala/tools/nsc/transform/UnCurry.scala
@@ -194,7 +194,7 @@ abstract class UnCurry extends InfoTransform
       else if (mustExpandFunction) gen.expandFunction(localTyper)(fun, inConstructorFlag)
       else {
         // method definition with the same arguments, return type, and body as the original lambda
-        val liftedMethod = gen.mkMethodFromFunction(localTyper)(fun.symbol.owner, fun, nme.ANON_FUN_NAME, ARTIFACT)
+        val liftedMethod = gen.mkLiftedFunctionBodyMethod(localTyper)(fun.symbol.owner, fun)
 
         // new function whose body is just a call to the lifted method
         val newFun = deriveFunction(fun)(_ => localTyper.typedPos(fun.pos)(