More flag football, run with it

scala · Mar 15, 2020 · 0412783 · 0412783
1 parent 941165b
commit 0412783
Show file tree

Hide file tree

Showing 249 changed files with 145 additions and 126 deletions.
diff --git a/test/files/run/bcodeInlinerMixed.flags b/test/files/run/bcodeInlinerMixed.flags
diff --git a/test/files/run/bcodeInlinerMixed/B_1.scala b/test/files/run/bcodeInlinerMixed/B_1.scala
@@ -1,3 +1,5 @@
+// scalac: -opt:l:inline -opt-inline-from:**
+//
 // Since 1.0.18, partest does mixed compilation only in two stages 
 //   1. scalac *.scala *.java
 //   2. javac *.java

diff --git a/test/files/run/bcodeInlinerMixed/Test_2.scala b/test/files/run/bcodeInlinerMixed/Test_2.scala
@@ -1,3 +1,5 @@
+// scalac: -opt:l:inline -opt-inline-from:**
+//
 import scala.tools.partest.BytecodeTest
 import scala.tools.testkit.ASMConverters
 import ASMConverters._

diff --git a/test/files/run/inline-stack-map-frames.flags b/test/files/run/inline-stack-map-frames.flags
diff --git a/test/files/run/inline-stack-map-frames/A_1.scala b/test/files/run/inline-stack-map-frames/A_1.scala
@@ -1,3 +1,4 @@
+// scalac: -opt:l:inline -opt-inline-from:**
 class A {
   @noinline final def b: B = null
   @inline final def a: A = b

diff --git a/test/files/run/inline-stack-map-frames/Test_2.scala b/test/files/run/inline-stack-map-frames/Test_2.scala
@@ -1,3 +1,4 @@
+// scalac: -opt:l:inline -opt-inline-from:**
 class C {
   def t(a: A): AnyRef = {
     // a.a is inlined, resulting in a.b, which has return type B

diff --git a/test/files/run/macro-abort-fresh.flags b/test/files/run/macro-abort-fresh.flags
diff --git a/test/files/run/macro-abort-fresh/Macros_1.scala b/test/files/run/macro-abort-fresh/Macros_1.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 import scala.reflect.macros.blackbox.Context
 
 object Impls {

diff --git a/test/files/run/macro-basic-ma-md-mi.flags b/test/files/run/macro-basic-ma-md-mi.flags
diff --git a/test/files/run/macro-basic-ma-md-mi/Macros_2.scala b/test/files/run/macro-basic-ma-md-mi/Macros_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Macros {
   object Shmacros {
     def foo(x: Int): Int = macro Impls.foo

diff --git a/test/files/run/macro-basic-ma-mdmi.flags b/test/files/run/macro-basic-ma-mdmi.flags
diff --git a/test/files/run/macro-basic-ma-mdmi/Impls_Macros_1.scala b/test/files/run/macro-basic-ma-mdmi/Impls_Macros_1.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 import scala.reflect.macros.blackbox.Context
 
 object Impls {

diff --git a/test/files/run/macro-basic-mamd-mi.flags b/test/files/run/macro-basic-mamd-mi.flags
diff --git a/test/files/run/macro-basic-mamd-mi/Macros_Test_2.scala b/test/files/run/macro-basic-mamd-mi/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Macros {
   object Shmacros {
     def foo(x: Int): Int = macro Impls.foo

diff --git a/test/files/run/macro-bodyexpandstoimpl.flags b/test/files/run/macro-bodyexpandstoimpl.flags
diff --git a/test/files/run/macro-def-path-dependent.flags b/test/files/run/macro-def-path-dependent.flags
diff --git a/test/files/run/macro-def-path-dependent/Test_2.scala b/test/files/run/macro-def-path-dependent/Test_2.scala
@@ -1,5 +1,6 @@
 package test2
 
+import scala.language.experimental.macros
 import scala.reflect.macros.blackbox.Context
 
 trait Exprs {

diff --git a/test/files/run/macro-def-path-dependent/Test_3.scala b/test/files/run/macro-def-path-dependent/Test_3.scala
@@ -1,5 +1,6 @@
 package test3
 
+import scala.language.experimental.macros
 import scala.reflect.macros.blackbox.Context
 
 trait Exprs {

diff --git a/test/files/run/macro-def-path-dependent/Test_4.scala b/test/files/run/macro-def-path-dependent/Test_4.scala
@@ -1,5 +1,6 @@
 package test4
 
+import scala.language.experimental.macros
 import scala.reflect.runtime.universe._
 import scala.reflect.macros.blackbox.Context
 import scala.reflect.api.Universe

diff --git a/test/files/run/macro-def-path-dependent/Test_6.scala b/test/files/run/macro-def-path-dependent/Test_6.scala
@@ -1,5 +1,6 @@
 package test56
 
+import scala.language.experimental.macros
 import scala.reflect.runtime.universe._
 import scala.reflect.macros.blackbox.Context
 import scala.reflect.api.Universe

diff --git a/test/files/run/macro-duplicate.flags b/test/files/run/macro-duplicate.flags
diff --git a/test/files/run/macro-duplicate/Impls_Macros_1.scala b/test/files/run/macro-duplicate/Impls_Macros_1.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 import scala.reflect.macros.blackbox.Context
 
 object Macros {

diff --git a/test/files/run/macro-enclosures.flags b/test/files/run/macro-enclosures.flags
diff --git a/test/files/run/macro-enclosures/Impls_Macros_1.scala b/test/files/run/macro-enclosures/Impls_Macros_1.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 import scala.reflect.macros.blackbox.Context
 
 object Macros {

diff --git a/test/files/run/macro-expand-implicit-argument.flags b/test/files/run/macro-expand-implicit-argument.flags
diff --git a/test/files/run/macro-expand-implicit-macro-has-implicit.flags b/test/files/run/macro-expand-implicit-macro-has-implicit.flags
diff --git a/test/files/run/macro-expand-implicit-macro-has-implicit/Macros_Test_2.scala b/test/files/run/macro-expand-implicit-macro-has-implicit/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Test extends App {
   implicit val x = 42
   def foo(implicit x: Int): Unit = macro Impls.foo

diff --git a/test/files/run/macro-expand-implicit-macro-is-implicit.flags b/test/files/run/macro-expand-implicit-macro-is-implicit.flags
diff --git a/test/files/run/macro-expand-implicit-macro-is-implicit/Macros_Test_2.scala b/test/files/run/macro-expand-implicit-macro-is-implicit/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Macros {
   import scala.language.implicitConversions
   implicit def foo(x: String): Option[Int] = macro Impls.foo

diff --git a/test/files/run/macro-expand-implicit-macro-is-val.flags b/test/files/run/macro-expand-implicit-macro-is-val.flags
diff --git a/test/files/run/macro-expand-implicit-macro-is-val/Macros_Test_2.scala b/test/files/run/macro-expand-implicit-macro-is-val/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Test extends App {
   implicit def foo: Int = macro Impls.foo
   def bar(implicit x: Int) = println(x)

diff --git a/test/files/run/macro-expand-implicit-macro-is-view.check b/test/files/run/macro-expand-implicit-macro-is-view.check
@@ -1,4 +1,4 @@
-Macros_Test_2.scala:10: warning: view bounds are deprecated; use an implicit parameter instead.
+Macros_Test_2.scala:11: warning: view bounds are deprecated; use an implicit parameter instead.
   example: instead of `def f[A <% Int](a: A)` use `def f[A](a: A)(implicit ev: A => Int)`
   def bar[T <% Option[Int]](x: T) = println(x)
             ^

diff --git a/test/files/run/macro-expand-implicit-macro-is-view.flags b/test/files/run/macro-expand-implicit-macro-is-view.flags
diff --git a/test/files/run/macro-expand-implicit-macro-is-view/Impls_1.scala b/test/files/run/macro-expand-implicit-macro-is-view/Impls_1.scala
@@ -1,3 +1,4 @@
+// scalac: -deprecation
 import scala.reflect.macros.blackbox.Context
 
 object Impls {

diff --git a/test/files/run/macro-expand-implicit-macro-is-view/Macros_Test_2.scala b/test/files/run/macro-expand-implicit-macro-is-view/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+// scalac: -deprecation
 
 object Macros {
   import scala.language.experimental.macros

diff --git a/test/files/run/macro-expand-multiple-arglists.flags b/test/files/run/macro-expand-multiple-arglists.flags
diff --git a/test/files/run/macro-expand-multiple-arglists/Macros_Test_2.scala b/test/files/run/macro-expand-multiple-arglists/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Test extends App {
   def foo(x: Int)(y: Int): Unit = macro Impls.foo
   foo(40)(2)

diff --git a/test/files/run/macro-expand-nullary-generic.flags b/test/files/run/macro-expand-nullary-generic.flags
diff --git a/test/files/run/macro-expand-nullary-generic/Macros_Test_2.scala b/test/files/run/macro-expand-nullary-generic/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Macros {
   def foo1[T]: Unit = macro Impls.fooNullary[T]
   def foo2[T](): Unit = macro Impls.fooEmpty[T]

diff --git a/test/files/run/macro-expand-nullary-nongeneric.flags b/test/files/run/macro-expand-nullary-nongeneric.flags
diff --git a/test/files/run/macro-expand-nullary-nongeneric/Macros_Test_2.scala b/test/files/run/macro-expand-nullary-nongeneric/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Macros {
   def foo1: Unit = macro Impls.fooNullary
   def foo2(): Unit = macro Impls.fooEmpty

diff --git a/test/files/run/macro-expand-overload.flags b/test/files/run/macro-expand-overload.flags
diff --git a/test/files/run/macro-expand-overload/Macros_Test_2.scala b/test/files/run/macro-expand-overload/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Macros {
   def foo(x: String): Unit = macro Impls.fooObjectString
   def foo(x: Int): Unit = macro Impls.fooObjectInt

diff --git a/test/files/run/macro-expand-override.flags b/test/files/run/macro-expand-override.flags
diff --git a/test/files/run/macro-expand-override/Macros_Test_2.scala b/test/files/run/macro-expand-override/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 class B {
   def foo(x: String): Unit = macro Impls.fooBString
   def foo(x: Int): Unit = macro Impls.fooBInt

diff --git a/test/files/run/macro-expand-recursive.flags b/test/files/run/macro-expand-recursive.flags
diff --git a/test/files/run/macro-expand-recursive/Macros_Test_2.scala b/test/files/run/macro-expand-recursive/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Macros {
   def foo: Unit = macro Impls.foo
   def fooFoo: Unit = macro Impls.fooFoo

diff --git a/test/files/run/macro-expand-tparams-bounds.flags b/test/files/run/macro-expand-tparams-bounds.flags
diff --git a/test/files/run/macro-expand-tparams-bounds/Macros_Test_2.scala b/test/files/run/macro-expand-tparams-bounds/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Macros1 {
   def foo[U <: String]: Unit = macro Impls1.foo[U]
 }

diff --git a/test/files/run/macro-expand-tparams-explicit.flags b/test/files/run/macro-expand-tparams-explicit.flags
diff --git a/test/files/run/macro-expand-tparams-explicit/Macros_Test_2.scala b/test/files/run/macro-expand-tparams-explicit/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Test extends App {
   def foo[U]: Unit = macro Impls.foo[U]
   foo[Int]

diff --git a/test/files/run/macro-expand-tparams-implicit.flags b/test/files/run/macro-expand-tparams-implicit.flags
diff --git a/test/files/run/macro-expand-tparams-implicit/Macros_Test_2.scala b/test/files/run/macro-expand-tparams-implicit/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Test extends App {
   def foo[U](x: U): Unit = macro Impls.foo[U]
   foo(42)

diff --git a/test/files/run/macro-expand-tparams-prefix.flags b/test/files/run/macro-expand-tparams-prefix.flags
diff --git a/test/files/run/macro-expand-tparams-prefix/Impls_1.scala b/test/files/run/macro-expand-tparams-prefix/Impls_1.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 import scala.reflect.runtime.universe._
 import scala.reflect.macros.blackbox.Context
 

diff --git a/test/files/run/macro-expand-tparams-prefix/Macros_Test_2.scala b/test/files/run/macro-expand-tparams-prefix/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Macros1 {
   class C[T] {
     def foo[U](x: U): Unit = macro Impls1.foo[U]

diff --git a/test/files/run/macro-expand-unapply-a.flags b/test/files/run/macro-expand-unapply-a.flags
diff --git a/test/files/run/macro-expand-unapply-a/Impls_Macros_1.scala b/test/files/run/macro-expand-unapply-a/Impls_Macros_1.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 import scala.reflect.macros.whitebox.Context
 
 object Helper {

diff --git a/test/files/run/macro-expand-varargs-explicit-over-nonvarargs-bad.flags b/test/files/run/macro-expand-varargs-explicit-over-nonvarargs-bad.flags
diff --git a/test/files/run/macro-expand-varargs-explicit-over-nonvarargs-bad/Macros_Test_2.scala b/test/files/run/macro-expand-varargs-explicit-over-nonvarargs-bad/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Macros {
   def foo(xs: Int*): Unit = macro Impls.foo
 }

diff --git a/test/files/run/macro-expand-varargs-explicit-over-nonvarargs-good.flags b/test/files/run/macro-expand-varargs-explicit-over-nonvarargs-good.flags
diff --git a/test/files/run/macro-expand-varargs-explicit-over-nonvarargs-good/Macros_Test_2.scala b/test/files/run/macro-expand-varargs-explicit-over-nonvarargs-good/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Macros {
   def foo(xs: Int*): Unit = macro Impls.foo
 }

diff --git a/test/files/run/macro-expand-varargs-explicit-over-varargs.flags b/test/files/run/macro-expand-varargs-explicit-over-varargs.flags
diff --git a/test/files/run/macro-expand-varargs-explicit-over-varargs/Macros_Test_2.scala b/test/files/run/macro-expand-varargs-explicit-over-varargs/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Macros {
   def foo(xs: Int*): Unit = macro Impls.foo
 }

diff --git a/test/files/run/macro-expand-varargs-implicit-over-nonvarargs.flags b/test/files/run/macro-expand-varargs-implicit-over-nonvarargs.flags
diff --git a/test/files/run/macro-expand-varargs-implicit-over-nonvarargs/Macros_Test_2.scala b/test/files/run/macro-expand-varargs-implicit-over-nonvarargs/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Macros {
   def foo(xs: Int*): Unit = macro Impls.foo
 }

diff --git a/test/files/run/macro-expand-varargs-implicit-over-varargs.flags b/test/files/run/macro-expand-varargs-implicit-over-varargs.flags
diff --git a/test/files/run/macro-expand-varargs-implicit-over-varargs/Macros_Test_2.scala b/test/files/run/macro-expand-varargs-implicit-over-varargs/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Macros {
   def foo(xs: Int*): Unit = macro Impls.foo
 }

diff --git a/test/files/run/macro-impl-default-params.flags b/test/files/run/macro-impl-default-params.flags
diff --git a/test/files/run/macro-impl-default-params/Impls_Macros_1.scala b/test/files/run/macro-impl-default-params/Impls_Macros_1.scala
@@ -1,5 +1,6 @@
-import scala.reflect.runtime.universe._
+import scala.language.experimental.macros
 import scala.reflect.macros.blackbox.Context
+import scala.reflect.runtime.universe._
 
 object Impls {
   def foo_targs[T, U: c.WeakTypeTag](c: Context = null)(x: c.Expr[Int] = null) = {

diff --git a/test/files/run/macro-impl-rename-context.flags b/test/files/run/macro-impl-rename-context.flags
diff --git a/test/files/run/macro-impl-rename-context/Impls_Macros_1.scala b/test/files/run/macro-impl-rename-context/Impls_Macros_1.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 import scala.reflect.macros.blackbox.Context
 
 object Impls {

diff --git a/test/files/run/macro-impl-tparam-only-in-impl.flags b/test/files/run/macro-impl-tparam-only-in-impl.flags
diff --git a/test/files/run/macro-impl-tparam-only-in-impl/Macros_Test_2.scala b/test/files/run/macro-impl-tparam-only-in-impl/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Macros {
   def foo: Unit = macro Impls.foo[String]
 }

diff --git a/test/files/run/macro-impl-tparam-typetag-is-optional.flags b/test/files/run/macro-impl-tparam-typetag-is-optional.flags
diff --git a/test/files/run/macro-impl-tparam-typetag-is-optional/Macros_Test_2.scala b/test/files/run/macro-impl-tparam-typetag-is-optional/Macros_Test_2.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 object Test extends App {
   def foo[U]: Unit = macro Impls.foo[U]
   foo[Int]

diff --git a/test/files/run/macro-implicit-decorator.flags b/test/files/run/macro-implicit-decorator.flags
diff --git a/test/files/run/macro-implicit-decorator/Macros_1.scala b/test/files/run/macro-implicit-decorator/Macros_1.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 import scala.reflect.macros.whitebox
 
 trait Derivation[A]

diff --git a/test/files/run/macro-invalidret-doesnt-conform-to-def-rettype.flags b/test/files/run/macro-invalidret-doesnt-conform-to-def-rettype.flags
diff --git a/test/files/run/macro-invalidret-doesnt-conform-to-def-rettype/Impls_Macros_1.scala b/test/files/run/macro-invalidret-doesnt-conform-to-def-rettype/Impls_Macros_1.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 import scala.reflect.macros.blackbox.Context
 
 object Impls {

diff --git a/test/files/run/macro-invalidret-nontypeable.flags b/test/files/run/macro-invalidret-nontypeable.flags
diff --git a/test/files/run/macro-invalidret-nontypeable/Impls_Macros_1.scala b/test/files/run/macro-invalidret-nontypeable/Impls_Macros_1.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 import scala.reflect.macros.blackbox.Context
 
 object Impls {

diff --git a/test/files/run/macro-invalidusage-badret.flags b/test/files/run/macro-invalidusage-badret.flags
diff --git a/test/files/run/macro-invalidusage-badret/Impls_Macros_1.scala b/test/files/run/macro-invalidusage-badret/Impls_Macros_1.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 import scala.reflect.macros.blackbox.Context
 
 object Impls {

diff --git a/test/files/run/macro-invalidusage-partialapplication-with-tparams.flags b/test/files/run/macro-invalidusage-partialapplication-with-tparams.flags
diff --git a/test/files/run/macro-invalidusage-partialapplication-with-tparams/Impls_Macros_1.scala b/test/files/run/macro-invalidusage-partialapplication-with-tparams/Impls_Macros_1.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 import scala.reflect.macros.blackbox.Context
 
 object Impls {

diff --git a/test/files/run/macro-invalidusage-partialapplication.flags b/test/files/run/macro-invalidusage-partialapplication.flags
diff --git a/test/files/run/macro-invalidusage-partialapplication/Impls_Macros_1.scala b/test/files/run/macro-invalidusage-partialapplication/Impls_Macros_1.scala
@@ -1,3 +1,4 @@
+import scala.language.experimental.macros
 import scala.reflect.macros.blackbox.Context
 
 object Impls {

diff --git a/test/files/run/macro-openmacros.check b/test/files/run/macro-openmacros.check
@@ -1,3 +1,3 @@
-List(MacroContext(foo@source-Test_2.scala,line-2,offset=35 +0))
-List(MacroContext(foo@source-Test_2.scala,line-2,offset=35 +1), MacroContext(foo@source-Test_2.scala,line-2,offset=35 +0))
-List(MacroContext(foo@source-Test_2.scala,line-2,offset=35 +2), MacroContext(foo@source-Test_2.scala,line-2,offset=35 +1), MacroContext(foo@source-Test_2.scala,line-2,offset=35 +0))
+List(MacroContext(foo@source-Test_2.scala,line-3,offset=63 +0))
+List(MacroContext(foo@source-Test_2.scala,line-3,offset=63 +1), MacroContext(foo@source-Test_2.scala,line-3,offset=63 +0))
+List(MacroContext(foo@source-Test_2.scala,line-3,offset=63 +2), MacroContext(foo@source-Test_2.scala,line-3,offset=63 +1), MacroContext(foo@source-Test_2.scala,line-3,offset=63 +0))
diff --git a/test/files/run/macro-openmacros.flags b/test/files/run/macro-openmacros.flags
diff --git a/test/files/run/macro-openmacros/Impls_Macros_1.scala b/test/files/run/macro-openmacros/Impls_Macros_1.scala
@@ -1,3 +1,5 @@
+// scalac: -Yrangepos:false
+import scala.language.experimental.macros
 import scala.reflect.macros.blackbox.Context
 
 object Macros {

diff --git a/test/files/run/macro-openmacros/Test_2.scala b/test/files/run/macro-openmacros/Test_2.scala
@@ -1,3 +1,4 @@
+// scalac: -Yrangepos:false
 object Test extends App {
   Macros.foo
 }
diff --git a/test/files/run/macro-parse-position.flags b/test/files/run/macro-parse-position.flags
diff --git a/test/files/run/macro-parse-position/Impls_Macros_1.scala b/test/files/run/macro-parse-position/Impls_Macros_1.scala
@@ -1,3 +1,4 @@
+// scalac: -Yrangepos:false
 import scala.language.experimental.macros
 import scala.reflect.macros.blackbox.Context
 

diff --git a/test/files/run/macro-parse-position/Test_2.scala b/test/files/run/macro-parse-position/Test_2.scala
@@ -1,3 +1,4 @@
+// scalac: -Yrangepos:false
 object Test extends App {
   println(Macros.foo)
 }