10 files changed, 35 insertions, 2 deletions
diff --git a/test/files/neg/delayed-init-ref.check b/test/files/neg/delayed-init-ref.check
index ce5b205832..90bc027969 100644
--- a/test/files/neg/delayed-init-ref.check
+++ b/test/files/neg/delayed-init-ref.check
@@ -4,9 +4,13 @@ delayed-init-ref.scala:17: warning: Selecting value vall from object O, which ex
 delayed-init-ref.scala:19: warning: Selecting value vall from object O, which extends scala.DelayedInit, is likely to yield an uninitialized value
   println(vall)       // warn
           ^
+delayed-init-ref.scala:28: warning: trait DelayedInit in package scala is deprecated: DelayedInit semantics can be surprising. Support for `App` will continue.
+See the release notes for more details: https://github.com/scala/scala/releases/tag/v2.11.0-RC1
+trait Before extends DelayedInit {
+                     ^
 delayed-init-ref.scala:40: warning: Selecting value foo from trait UserContext, which extends scala.DelayedInit, is likely to yield an uninitialized value
     println({locally(()); this}.foo)  // warn (spurious, but we can't discriminate)
                                 ^
 error: No warnings can be incurred under -Xfatal-warnings.
-three warnings found
+four warnings found
 one error found
diff --git a/test/files/neg/delayed-init-ref.flags b/test/files/neg/delayed-init-ref.flags
index 7949c2afa2..88a3e4c676 100644
--- a/test/files/neg/delayed-init-ref.flags
+++ b/test/files/neg/delayed-init-ref.flags
@@ -1 +1 @@
--Xlint -Xfatal-warnings
+-deprecation -Xlint -Xfatal-warnings
diff --git a/test/files/pos/t8315.flags b/test/files/pos/t8315.flags
new file mode 100644
index 0000000000..c926ad6493
--- /dev/null
+++ b/test/files/pos/t8315.flags
@@ -0,0 +1 @@
+-Yinline -Ydead-code
diff --git a/test/files/pos/t8315.scala b/test/files/pos/t8315.scala
new file mode 100644
index 0000000000..2f7742ed67
--- /dev/null
+++ b/test/files/pos/t8315.scala
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000000..c926ad6493
--- /dev/null
+++ b/test/files/pos/t8315b.flags
@@ -0,0 +1 @@
+-Yinline -Ydead-code
diff --git a/test/files/pos/t8315b.scala b/test/files/pos/t8315b.scala
new file mode 100644
index 0000000000..d7a2bf565f
--- /dev/null
+++ b/test/files/pos/t8315b.scala
@@ -0,0 +1,11 @@
+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/run/delay-bad.check b/test/files/run/delay-bad.check
index 2ae88267c5..5d8c5fa1d4 100644
--- a/test/files/run/delay-bad.check
+++ b/test/files/run/delay-bad.check
@@ -4,6 +4,7 @@ delay-bad.scala:53: warning: a pure expression does nothing in statement positio
 delay-bad.scala:73: warning: a pure expression does nothing in statement position; you may be omitting necessary parentheses
     f(new { val x = 5 } with E() { 5 })
                                    ^
+warning: there were 1 deprecation warning(s); re-run with -deprecation for details
 
 
 // new C { }
diff --git a/test/files/run/t4396.check b/test/files/run/t4396.check
index 58f4fc5138..a75e1f257f 100644
--- a/test/files/run/t4396.check
+++ b/test/files/run/t4396.check
@@ -1,3 +1,4 @@
+warning: there were 1 deprecation warning(s); re-run with -deprecation for details
 hallo
 constructor
 out:22
diff --git a/test/files/run/t4680.check b/test/files/run/t4680.check
index b2e5209dc5..512bfd4b54 100644
--- a/test/files/run/t4680.check
+++ b/test/files/run/t4680.check
@@ -4,6 +4,7 @@ t4680.scala:51: warning: a pure expression does nothing in statement position; y
 t4680.scala:69: warning: a pure expression does nothing in statement position; you may be omitting necessary parentheses
     new { val x = 5 } with E() { 5 }
                                  ^
+warning: there were 1 deprecation warning(s); re-run with -deprecation for details
 
 
 // new C { }
diff --git a/test/files/run/t6481.check b/test/files/run/t6481.check
index 7ec29631b1..df40722242 100644
--- a/test/files/run/t6481.check
+++ b/test/files/run/t6481.check
@@ -1,3 +1,4 @@
+warning: there were 1 deprecation warning(s); re-run with -deprecation for details
 delayed init
 new foo(1, 2)
 delayed init