Merge pull request #4968 from lrytz/oldOptCleanup

Remove -Y settings that are no longer used in 2.12

10 files changed, 4 insertions, 41 deletions

diff --git a/test/files/pos/SI-7060.flags b/test/files/pos/SI-7060.flags
deleted file mode 100644
index c926ad6493..0000000000
--- a/test/files/pos/SI-7060.flags
+++ /dev/null
@@ -1 +0,0 @@
--Yinline -Ydead-code
diff --git a/test/files/pos/SI-7060.scala b/test/files/pos/SI-7060.scala
deleted file mode 100644
index c87620e020..0000000000
--- a/test/files/pos/SI-7060.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-object Test {
-
-  @inline final def mbarray_apply_minibox(array: Any, tag: Byte): Long =
-    if (tag == 0) {
-      array.asInstanceOf[Array[Long]](0)
-    } else
-      array.asInstanceOf[Array[Byte]](0).toLong
-
-  def crash_method(): Unit =
-    mbarray_apply_minibox(null, 0)
-}
diff --git a/test/files/pos/inline-access-levels.flags b/test/files/pos/inline-access-levels.flags
index d34387c651..9af9168a20 100644
--- a/test/files/pos/inline-access-levels.flags
+++ b/test/files/pos/inline-access-levels.flags
@@ -1 +1 @@
--Yopt:l:classpath -Xfatal-warnings -Yinline-warnings
+-Yopt:l:classpath -Xfatal-warnings -Yopt-warnings
diff --git a/test/files/pos/t3234.flags b/test/files/pos/t3234.flags
index 78726f64f7..13878e00a9 100644
--- a/test/files/pos/t3234.flags
+++ b/test/files/pos/t3234.flags
@@ -1 +1 @@
--Yopt:l:project -Yinline-warnings -Xfatal-warnings
+-Yopt:l:project -Yopt-warnings -Xfatal-warnings
diff --git a/test/files/pos/t8315.flags b/test/files/pos/t8315.flags
deleted file mode 100644
index c926ad6493..0000000000
--- a/test/files/pos/t8315.flags
+++ /dev/null
@@ -1 +0,0 @@
--Yinline -Ydead-code
diff --git a/test/files/pos/t8315.scala b/test/files/pos/t8315.scala
deleted file mode 100644
index 2f7742ed67..0000000000
--- a/test/files/pos/t8315.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-object Test {
-  def crash(as: Listt): Unit = {
-    map(as, (_: Any) => return)
-  }
- 
-  final def map(x: Listt, f: Any => Any): Any = {
-    if (x eq Nill) "" else f("")
-  }
-}
- 
-object Nill extends Listt
-class Listt
diff --git a/test/files/pos/t8315b.flags b/test/files/pos/t8315b.flags
deleted file mode 100644
index c926ad6493..0000000000
--- a/test/files/pos/t8315b.flags
+++ /dev/null
@@ -1 +0,0 @@
--Yinline -Ydead-code
diff --git a/test/files/pos/t8315b.scala b/test/files/pos/t8315b.scala
deleted file mode 100644
index d7a2bf565f..0000000000
--- a/test/files/pos/t8315b.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-object Test extends Object {
-  def crash: Unit = {
-    val key = ""
-    try map(new F(key))
-    catch { case _: Throwable => }
-  };
-  final def map(f: F): Any = f.apply("");
-};
-final class F(key: String) {
-  final def apply(a: Any): Any = throw new RuntimeException(key);
-}
diff --git a/test/files/pos/t8410.flags b/test/files/pos/t8410.flags
index 01fc9cd3ac..c3065096cf 100644
--- a/test/files/pos/t8410.flags
+++ b/test/files/pos/t8410.flags
@@ -1 +1 @@
--Yopt:l:project -Xfatal-warnings -deprecation:false -Yinline-warnings:false
+-Yopt:l:project -Xfatal-warnings -deprecation:false -Yopt-warnings:none
diff --git a/test/files/pos/t9111-inliner-workaround.flags b/test/files/pos/t9111-inliner-workaround.flags
index 63b5558cfd..422d6be431 100644
--- a/test/files/pos/t9111-inliner-workaround.flags
+++ b/test/files/pos/t9111-inliner-workaround.flags
@@ -1 +1 @@
--Ybackend:GenBCode -Yopt:l:classpath
\ No newline at end of file
+-Yopt:l:classpath
\ No newline at end of file