Default to delambdafy:method and backend:GenBCode

Switch the defaults of `-Ydelambdafy` and `-Ybackend`.

Rewrite t6288b-jump-position test - no more icode

Don't crash GenBCode beyond JVM code size limits
A similar patch is in GenASM, see 3fa2c97

Fix check files for GenBCode / delambdafy:method defaults

Force copy propagation test to ASM, see SI-9364

Force inline-ex-handlers test to GenASM, see SI-9364

Move t6613 test to pending - still broken in GenBCode
Adding a `flags` file with `-Ybackend:GenASM` doesn't seem to have
the desired effect.
SI-6613 is re-opened.

Force a few tests to GenASM, see SI-9364

Author: lrytz

src/compiler/scala/tools/nsc/backend/jvm/GenBCode.scala

@@ -242,6 +242,9 @@ abstract class GenBCode extends BCodeSyncAndTry {
               localOptimizations(item.plain)
               addToQ3(item)
           } catch {
+              case e: java.lang.RuntimeException if e.getMessage != null && (e.getMessage contains "too large!") =>
+                reporter.error(NoPosition,
+                  s"Could not write class ${item.plain.name} because it exceeds JVM code size limits. ${e.getMessage}")
               case ex: Throwable =>
                 ex.printStackTrace()
                 error(s"Error while emitting ${item.plain.name}\n${ex.getMessage}")

src/compiler/scala/tools/nsc/settings/ScalaSettings.scala

@@ -222,9 +222,8 @@ trait ScalaSettings extends AbsScalaSettings
   val YdisableUnreachablePrevention = BooleanSetting("-Ydisable-unreachable-prevention", "Disable the prevention of unreachable blocks in code generation.")
   val YnoLoadImplClass = BooleanSetting   ("-Yno-load-impl-class", "Do not load $class.class files.")
 
-  val exposeEmptyPackage = BooleanSetting("-Yexpose-empty-package", "Internal only: expose the empty package.").internalOnly()
-  // the current standard is "inline" but we are moving towards "method"
-  val Ydelambdafy        = ChoiceSetting     ("-Ydelambdafy", "strategy", "Strategy used for translating lambdas into JVM code.", List("inline", "method"), "inline")
+  val exposeEmptyPackage = BooleanSetting ("-Yexpose-empty-package", "Internal only: expose the empty package.").internalOnly()
+  val Ydelambdafy        = ChoiceSetting  ("-Ydelambdafy", "strategy", "Strategy used for translating lambdas into JVM code.", List("inline", "method"), "method")
 
   val YskipInlineInfoAttribute = BooleanSetting("-Yskip-inline-info-attribute", "Do not add the ScalaInlineInfo attribute to classfiles generated by -Ybackend:GenASM")
 
@@ -352,7 +351,7 @@ trait ScalaSettings extends AbsScalaSettings
    */
   val Ybackend = ChoiceSetting ("-Ybackend", "choice of bytecode emitter", "Choice of bytecode emitter.",
                                 List("GenASM", "GenBCode"),
-                                "GenASM")
+                                "GenBCode")
   // Feature extensions
   val XmacroSettings          = MultiStringSetting("-Xmacro-settings", "option", "Custom settings for macros.")
 

test/files/jvm/innerClassAttribute.check

@@ -1,4 +1,4 @@
-#partest !-Ydelambdafy:method
+#partest -Ydelambdafy:inline
 -- A4 --
 A4$$anonfun$f$1 / null / null / 17
 A4$$anonfun$f$1 / null / null / 17
@@ -35,7 +35,7 @@ A20 / null / null
 A20$$anonfun$4 / null / null
 A20$$anonfun$4 / null / null
 A20$$anonfun$4$$anonfun$apply$2 / null / null
-#partest -Ydelambdafy:method
+#partest !-Ydelambdafy:inline
 -- A4 --
 null / null / null
 -- A19 --

test/files/jvm/javaReflection.check

@@ -1,4 +1,4 @@
-#partest !-Ydelambdafy:method
+#partest -Ydelambdafy:inline
 A$$anonfun$$lessinit$greater$1 / null (canon) / $anonfun$$lessinit$greater$1 (simple)
 - declared cls: List()
 - enclosing   : null (declaring cls) / class A (cls) / public A(int) (constr) / null (meth)
@@ -39,7 +39,7 @@ AT$$anonfun$6 / null (canon) / $anonfun$6 (simple)
 - declared cls: List()
 - enclosing   : null (declaring cls) / interface AT (cls) / null (constr) / null (meth)
 - properties  : true (local) / false (member)
-#partest -Ydelambdafy:method
+#partest !-Ydelambdafy:inline
 A$D$lambda$1 / A$D$lambda$1 (canon) / A$D$lambda$1 (simple)
 - declared cls: List()
 - enclosing   : null (declaring cls) / null (cls) / null (constr) / null (meth)

test/files/jvm/t9105.check

@@ -1,4 +1,4 @@
-#partest !-Ydelambdafy:method
+#partest -Ydelambdafy:inline
 (class C$$anonfun$1$A$1,class C$$anonfun$1,null)
 (class C$$anonfun$1$B$1,class C$$anonfun$1,private final java.lang.Object C$$anonfun$1.m$1())
 (class C$$anonfun$1$C$1,class C$$anonfun$1,null)
@@ -7,7 +7,7 @@
 (class C$$anonfun$met$1$F$1,class C$$anonfun$met$1,private final java.lang.Object C$$anonfun$met$1.m$2())
 (class C$$anonfun$met$1$G$1,class C$$anonfun$met$1,null)
 (class C$$anonfun$met$1$$anonfun$3$H$1,class C$$anonfun$met$1$$anonfun$3,null)
-#partest -Ydelambdafy:method
+#partest !-Ydelambdafy:inline
 (class C$A$1,class C,null)
 (class C$B$1,class C,private final java.lang.Object C.m$1())
 (class C$C$1,class C,null)

test/files/run/delambdafy-specialized.flags

@@ -1 +1 @@
--Ydelambdafy:method
+-Ydelambdafy:method -Ybackend:GenASM

test/files/run/delambdafy_t6028.check

@@ -21,7 +21,7 @@ package <empty> {
     def tryy(tryyParam: String): Function0 = {
       var tryyLocal: runtime.ObjectRef = scala.runtime.ObjectRef.create("");
       {
-        (new <$anon: Function0>(T.this, tryyParam, tryyLocal): Function0)
+        (() => T.this.$anonfun$2(tryyParam, tryyLocal)).$asInstanceOf[Function0]()
       }
     };
     final <artifact> private[this] def $anonfun$1(methodParam$1: String, methodLocal$1: String): String = T.this.classParam.+(T.this.field()).+(methodParam$1).+(methodLocal$1);
@@ -48,24 +48,9 @@ package <empty> {
       };
       scala.this.Predef.print(barParam$1)
     };
-    @SerialVersionUID(value = 0) final <synthetic> class $anonfun$tryy$1 extends scala.runtime.AbstractFunction0$mcV$sp with Serializable {
-      def <init>($outer: T, tryyParam$1: String, tryyLocal$1: runtime.ObjectRef): <$anon: Function0> = {
-        $anonfun$tryy$1.super.<init>();
-        ()
-      };
-      final def apply(): Unit = $anonfun$tryy$1.this.apply$mcV$sp();
-      <specialized> def apply$mcV$sp(): Unit = try {
-        $anonfun$tryy$1.this.tryyLocal$1.elem = $anonfun$tryy$1.this.tryyParam$1
-      } finally ();
-      <synthetic> <paramaccessor> <artifact> private[this] val $outer: T = _;
-      <synthetic> <stable> <artifact> def $outer(): T = $anonfun$tryy$1.this.$outer;
-      final <bridge> <artifact> def apply(): Object = {
-        $anonfun$tryy$1.this.apply();
-        scala.runtime.BoxedUnit.UNIT
-      };
-      <synthetic> <paramaccessor> private[this] val tryyParam$1: String = _;
-      <synthetic> <paramaccessor> private[this] val tryyLocal$1: runtime.ObjectRef = _
-    }
+    final <artifact> private[this] def $anonfun$2(tryyParam$1: String, tryyLocal$1: runtime.ObjectRef): Unit = try {
+      tryyLocal$1.elem = tryyParam$1
+    } finally ()
   }
 }